[automerger skipped] Merge "Flipping NR signal strengths coming from HAL" am:...
[automerger skipped] Merge "Flipping NR signal strengths coming from HAL" am: a9298cc0 am: 6f4151d3 am: 9333d003 -s ours
am skip reason: Change-Id Ica2595c5b6480a52209fe5ec93de63c9f323316a with SHA-1 7eaf688c is in history
Change-Id: I211983e75938254eac5a9cd4087f150cc78cbd93