Merge Android 12

Bug: 202323961
Merged-In: If0b60e5553f8fb9d4a85a09b440639e62e3277dc
Change-Id: I979fdef057d4121c95b7ab31c5ac3f1832973bfe
diff --git a/jni/OWNERS b/jni/OWNERS
index 52c0a12..045fb4d 100644
--- a/jni/OWNERS
+++ b/jni/OWNERS
@@ -1,2 +1 @@
 chaviw@google.com
-wanggang@google.com
diff --git a/native/OWNERS b/native/OWNERS
index 52c0a12..045fb4d 100644
--- a/native/OWNERS
+++ b/native/OWNERS
@@ -1,2 +1 @@
 chaviw@google.com
-wanggang@google.com