resolve merge conflicts of 80e5c0bfa to stage-aosp-master

Test: build
Change-Id: Ib8f66d9dcdf9dda317d4dee5207752f2f23e39cb
diff --git a/sepolicy/radio.te b/sepolicy/radio.te
index db47a29..6015398 100644
--- a/sepolicy/radio.te
+++ b/sepolicy/radio.te
@@ -35,3 +35,8 @@
 
 # read access to sys/module/diagchar/parameters/timestamp_switch
 allow radio sysfs_timestamp_switch:file r_file_perms;
+
+# TODO scope this down. Granting these here is not granting new permissions,
+# just moving existing permissions from domain_deprecated to radio as part of
+# b/28760354 in order to deprivilege other processes which do not need access.
+r_dir_file(radio, sysfs)