Merge "Update AndroidX from build 12139275" into main