[automerger skipped] Copy multi-image editor fix to QPR am: 09daaaf5 -s ours...

[automerger skipped] Copy multi-image editor fix to QPR am: 09daaaf5 -s ours am: 46188629 -s ours

am skip reason: Merged-In Id6ce93efacd54a86d870595ae32b4e6efcec0c04 with SHA-1 49c433e2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20056428



Change-Id: Ice15ffa6f8afff6694a86c8eaa44d34d18a9a708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>