Snap for 11510257 from 92bfe739812beec44c20532857713720d5946294 to simpleperf-release

Change-Id: I91ef4991286e6c1f12c1e3533c871382c5659b46
diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS
index 6214fba..c677475 100644
--- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS
+++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS
@@ -1,5 +1,4 @@
 # Primary maintainer
-sergeynv@google.com
 
 # Other maintainers (ATV Core Framework team)
 bronger@google.com
diff --git a/service/Android.bp b/service/Android.bp
index ce30e4d..f6e78ec 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -162,6 +162,7 @@
         ":statslog-service-permission-java-gen",
     ],
     libs: [
+        "androidx.annotation_annotation",
         "framework-statsd.stubs.module_lib",
     ],
     apex_available: [