Merge "XYZ Upgrades to androidx." into pi-dev
am: ebe7fe5c54

Change-Id: Ib962c08677e9e512f781073f4543fac12b079066