[automerger skipped] Merge "Update tests for NR signal strength" am:...

[automerger skipped] Merge "Update tests for NR signal strength" am: e9cfc668 am: d0129071 am: 99bb2b3f am: 12a203d8 -s ours am: 235a5826 -s ours

am skip reason: Merged-In I10e55e8da62b1377ba6dafe800e60ee5e7dd7f92 with SHA-1 515cf488 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2160077



Change-Id: I7dd7f8394f82b09fb075d09dc62c6f0749cb665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>