Merge "DO NOT MERGE - Import AndroidX from build 5571325" into qt-dev
am: 1edf397ef6

Change-Id: I570f547d4adda7735b915df757a6d158abcec776