Merge "Move Gallery2 to androidx." into pi-dev am: 0093dbfb7e
am: 655505bb7a

Change-Id: I23351ae31f3018b172a11ed4a021c4760ed362f9