Merge "Update AndroidX from build 11635875" into main