[automerger skipped] Merge "Copy multi-image editor fix to QPR" into tm-qpr-dev am: 7b19c4b99f -s ours
am skip reason: Merged-In Id6ce93efacd54a86d870595ae32b4e6efcec0c04 with SHA-1 49c433e211 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20056428
Change-Id: I298e49c553f7c7b3b5bf21c85f7a0c9ecdf4050d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: