Merge "Revert "Move Gallery2 to androidx."" into pi-dev
am: f2f4b814b2

Change-Id: I2d98e71d09ecf1068be60493cebface5dafa55cb