Merge "Update AndroidX from build 11197013" into main