Merge "Fix CQI range in CellSignalStrengthNr" into sc-dev am: 2d5cbc5d2d am: c69fbc99a2

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

Change-Id: I95b898fb391bc33b05c273d71c61963c5ac8d545