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

Change-Id: I47c3485c86a11438e5f6960f48938e35b7debe74