Merge "Update AndroidX from build 11810460" into main