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

Change-Id: Iaa7441485c9ee64c3badd83452178d085346b3c8