Keep AOSP sepolicy up to date with internal master

This re-alignes aosp and internal master to avoid
conflicts when uploading CLs upstream.

Bug: 170126760
Change-Id: I9c087e70998cd529b71dec7428641c4bfef10d31
diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 5882ee7..e5f2315 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -24,8 +24,8 @@
     mediatranscoding_tmpfs
     music_recognition_service
     people_service
-    power_stats_service
     power_debug_prop
+    power_stats_service
     profcollectd
     profcollectd_data_file
     profcollectd_exec
diff --git a/private/service_contexts b/private/service_contexts
index be4aa2b..bbed660 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -175,6 +175,7 @@
 phone2                                    u:object_r:radio_service:s0
 phone                                     u:object_r:radio_service:s0
 pinner                                    u:object_r:pinner_service:s0
+power_stats                               u:object_r:power_stats_service:s0
 power                                     u:object_r:power_service:s0
 print                                     u:object_r:print_service:s0
 processinfo                               u:object_r:processinfo_service:s0