DO NOT MERGE Import AndroidX from build 5640327
am: 5ad4d88c20

Change-Id: I66078067763ca3408c571bf6e93a5342419318b7