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

Change-Id: I7548d185f7bb9b09a4ccd2de97e4115c535ed5e7