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

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



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