Merge "Import AndroidX from build 5508236" into qt-dev
am: 2f4ae43891

Change-Id: I0b344b9543f447e9f5ad92b882a1271454436498