Merge "Update AndroidX from build 11906656" into main