[automerger skipped] Merge "Change the threshold for RSSNR from 10*db to db"...

[automerger skipped] Merge "Change the threshold for RSSNR from 10*db to db" am: 44550140 am: 89dcc9e9 -s ours am: 1c32459a -s ours am: f380843f -s ours am: 37bbc248 -s ours

am skip reason: Change-Id I9bc4b2f601d7d3f2a32ca34768ecb2a78d59d5bb with SHA-1 6775b77b is in history

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

Change-Id: Ib0d3c3bef1c8717f346299adf9508b267d10a9e2