[automerger skipped] Merge "Change the range checking for ssrsrq" am: abdc06b2d2 am: 3d04a71f12 am: 9328760e16 -s ours

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

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

Change-Id: Ia4fb55838c1f7034579352400aeaac2508fb7266