Merge "Update Android manifests to allow using android studio with android 12"