Merge "Fix rotation flicker issue when screenshot rotates with HDR content."...

Merge "Fix rotation flicker issue when screenshot rotates with HDR content." into tm-dev am: 0ba469a7 am: d26d27e4 am: f60a3d93 am: 944ec22c

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



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