(clean cherry-pick from AOSP) Bug: 151110495 Test: atest android.net.cts.RssiCurveTest Change-Id: Ife157773f7bdb07d62c5b9a66810328d9fd5ac91 Merged-In: Ife157773f7bdb07d62c5b9a66810328d9fd5ac91