Merge "Change the range checking for ssrsrq am: 71818ce4 am: 1818db33" into rvc-qpr-dev-plus-aosp am: 0985c029

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

Change-Id: I29bdb06502d97ecc5594008ca2277f9fd4173d78