[automerger skipped] Merge Android U (ab/10368041) am: ad837e70f4 -s ours am: 91be16b6c7 -s ours am: e48dad8ad9 -s ours am: ae031adfcf -s ours

am skip reason: Merged-In Ie57b7ae1cdd680523e78d20809aa9b37051a6808 with SHA-1 71e5601787 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix-sepolicy/+/24181615

Change-Id: Ifdd3b9979e0839367fe726e0d7e375ab63ed689e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/OWNERS b/OWNERS
index 791abb4..5232bc3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
-include platform/system/sepolicy:/OWNERS
+include device/google/gs-common:/sepolicy/OWNERS
 
-rurumihong@google.com
+adamshih@google.com
+
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 7932443..dae0a4a 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,11 +1,2 @@
-derive_sdk dumpstate fifo_file b/275001897
-dump_power_gs201 battery_history_device chr_file b/281602658
-hal_camera_default boot_status_prop file b/275001798
-hal_camera_default edgetpu_app_service service_manager b/275001798
-hal_dumpstate_default proc file b/240632721
-hal_dumpstate_default sysfs file b/240632721
-incident dumpstate fifo_file b/275001799
-servicemanager hal_fingerprint_capacitance binder b/240632821
-system_app proc_pagetypeinfo file b/270633150
-system_server system_userdir_file dir b/280706429
-vndservicemanager hal_keymint_citadel binder b/270247256
+incidentd debugfs_wakeup_sources file b/282626428
+incidentd incidentd anon_inode b/282626428
diff --git a/tracking_denials/dumpstate.te b/tracking_denials/dumpstate.te
deleted file mode 100644
index 5d94f92..0000000
--- a/tracking_denials/dumpstate.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/277155247
-dontaudit dumpstate default_android_service:service_manager { find };
diff --git a/tracking_denials/shell.te b/tracking_denials/shell.te
deleted file mode 100644
index 5caa2cc..0000000
--- a/tracking_denials/shell.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/277155366
-dontaudit shell sysfs_net:file { read };