Merge "Update AndroidX from build 11640849" into main