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

Change-Id: I2ec5d3f8ba1e960f9a324bac0722c60669e55a47