[automerger skipped] Skip ab/6749736 in stage. am: 8db3f4f44c -s ours am skip reason: Change-Id Ibaa38aa34b220099e80bf08649f6eb10e2f9764e with SHA-1 a7af59fbd8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery/+/12796872 Change-Id: Iae34841e1c90334786626d153ea0dc5199ba8258