Merge "Update AndroidX from build 11842967" into main