[automerger skipped] Merge "Change the range checking for ssrsrq" am:...

[automerger skipped] Merge "Change the range checking for ssrsrq" am: abdc06b2 am: 3d04a71f am: 9328760e -s ours am: 2e9efc49 -s ours

am skip reason: Change-Id I383f3b5c7b4e89fa7e9cd3be6e77c3d99552b99c with SHA-1 71818ce4 is in history

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

Change-Id: Id1ed4d56270a6b3256baeb15de1d357ed5b0c361