Make change and version bump to aml_per_331710050 for mainline module file: PermissionController/AndroidManifest.xml Make change and version bump to aml_per_331710050 for mainline module file: apex_manifest.json Merge cherrypicks of ['googleplex-android-review.googlesource.com/22933558', 'googleplex-android-review.googlesource.com/23045456'] into sparse-9831405-L59500000960463553. SPARSE_CHANGE: I5c53eea0bd581743d58bba7b8b552aa468b7a641 SPARSE_CHANGE: If3093cffe80cd2b3eec1ce0ba7e125d9b64e6ef0 Change-Id: I3f50f62ac59be1386b693e1ee62fc1721c1c4270