Merge "AOSP Gallery2 API level downgrade" am: fd090edc9c am: f6eaf6c72c

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

Change-Id: If3d36c15e515f85cd778a82be849fe01294b0ef1