Merge "AOSP Gallery2 API level downgrade" am: fd090edc9c

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

Change-Id: I2e7904b7a8d4c455e9d1ea2033966ed55ba3bf09