[automerger skipped] Merge "Fix CQI range in CellSignalStrengthNr" am:...

[automerger skipped] Merge "Fix CQI range in CellSignalStrengthNr" am: 1a343379 am: bd210577 -s ours am: c030e76e -s ours

am skip reason: Merged-In I784f2930999871b6bb90f4e17a2ba694da35126a with SHA-1 9ee4e9bb is already in history

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

Change-Id: I469898b442adc71b61bcb3ac97065f11aae97a26