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

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

Change-Id: I8788b57f275a8d81b3a01df375671bf53648ce0c