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

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

Change-Id: I0e113a188b44ba972a1e232ccc507ce026019dca