Merge "Prevent hdrSdrRatio from being <1.f" into udc-dev am: 0a66b05785 am: 1d7440ca09

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

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