Merge "Change the range checking for ssrsrq am: 71818ce490 am: 1818db33e9" into rvc-qpr-dev-plus-aosp