Merge "AOSP/Gallery2 - Updated to sdkVersion 29." am: 8cfe9822b1 am: 48f633209f
am: 82fa4dcd0c

Change-Id: Ic2be505f662a9103f60649ab7c51eb6d103131b4