Merge "Fix crash issue when gallery app with Ultra HDR photo is moved to the virtual display." into main am: b043595d84

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

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