Merge "Fix tone shift issue when switching between GPU and DPU composition."...

Merge "Fix tone shift issue when switching between GPU and DPU composition." into udc-dev am: 74154078 am: 1d50177c

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



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