[automerger skipped] Merge "Fix crash issue when gallery app with Ultra HDR...

[automerger skipped] Merge "Fix crash issue when gallery app with Ultra HDR photo is moved to the virtual display." into main am: b043595d am: 6bb1b75a -s ours

am skip reason: Merged-In Ic69b633d6042145a537c7d39e713f804faff6600 with SHA-1 15e666c8 is already in history

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



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