Merge "Import AndroidX from build 6528243" into rvc-dev am: 6367eb81f4

Change-Id: Ifb6339e4b9742880d29577bed85b3ce770ad1a86