Merge "API level 30 upgrade: AOSP/Gallery2" am: 0c4ace25a3 am: 3f74e1f7a1 am: 651cb829b9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1776546

Change-Id: I95873cb6cad9132152f9600c58ea33e4c8b85fdc