Merge "Fix rotation flicker issue when screenshot rotates with HDR content." into tm-dev am: 0ba469a719 am: fe1df9942b

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

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