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

Change-Id: If7793e2bd02074b6daae298b735bce77ff554e49