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