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