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

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

Change-Id: I3de1655d9183486f914b3461721083b344966f71