Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I42fd0c1e3eb37654bb1cca849337008f726309e8
Change-Id: I23666b51f76a53f5aafcc4c3516003ac488d0c2f

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f8856ae..607de02 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   package="com.android.permissioncontroller"
   coreApp="true"
-  android:versionCode="300000000"
-  android:versionName="30 system image"
+  android:versionCode="300900700"
+  android:versionName="r_aml_300900700"
 >
 
     <original-package android:name="com.android.permissioncontroller" />