resolved conflicts for merge of b2eaa28d to lmp-dev-plus-aosp

Change-Id: Ifb5d9765b08217307a6b7bc5a0b3215d48c2985b

dumpstate.te

@@ -96,3 +96,7 @@ control_logd(dumpstate)
 # Read network state info files.
 allow dumpstate net_data_file:dir search;
 allow dumpstate net_data_file:file r_file_perms;
+
+# Access /data/tombstones.
+allow dumpstate tombstone_data_file:dir r_dir_perms;
+allow dumpstate tombstone_data_file:file r_file_perms;