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: 8d8db774

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



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