Merge "Change the range checking for ssrsrq" am: abdc06b2d2 am: 3d04a71f12

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

Change-Id: I6ccc9ea866d1a2ccb41d75bcea0671df64e4f735