Merge "Update AndroidX from build 11667602" into main