Merge "Update AndroidX from build 11839062" into main