Import AndroidX from build 4714337
am: e4b0318a84

Change-Id: I1ccf06354cd8844fc30895f71a0b8ca6b1fd7f0f