[automerger skipped] Merge "Copy multi-image editor fix to QPR" into...

[automerger skipped] Merge "Copy multi-image editor fix to QPR" into tm-qpr-dev am: 7b19c4b9 -s ours am: 5a91e09e -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: Iace107c80ef15bb0796caaec7c651edd07bed0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>