Merge "Update AndroidX from build 11691180" into main