Merge "Update AndroidX from build 11790862" into main