Merge "Update AndroidX from build 11689954" into main