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

Change-Id: Ie4b119440a85cf6ca53a6087c95cbaca2069efe3