Merge "Import AndroidX from build 8484248" into tm-dev