Merge "API level 30 upgrade: AOSP/Gallery2"