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

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

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