Merge "Fix judgment logic of DisplayDeviceConfig#loadSdrHdrRatioMap." into main am: 986030fba4

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

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