Merge "AOSP/Gallery2 - Updated to sdkVersion 29." am: 361ed5df20

Change-Id: I650e770365c00ff6ab0211c7f975e166865fc9b2