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

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

Change-Id: I6f36d7c1ac41fe9227ddac550a0636ae0c4ccb8b