Merge "Pass the max desired hdr/sdr ratio to DisplayManager" into udc-dev am:...

Merge "Pass the max desired hdr/sdr ratio to DisplayManager" into udc-dev am: 3325f3e2 am: b13c0926

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



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