Merge "Update AndroidX from build 11654754" into main