Merge "Update AndroidX from existing prebuilts to restore altered manifests" into main