[automerger skipped] Merge "Flipping NR signal strengths coming from HAL" am:...
[automerger skipped] Merge "Flipping NR signal strengths coming from HAL" am: a837de9a am: 54e38c34 am: f5c3015f -s ours
am skip reason: Change-Id I086cf6188b7948fa24715c2b2f7a03ba34d0cbd3 with SHA-1 ba25904e is in history
Change-Id: I2e5d50879b12978b22dbdcdb82ad4d0da4a59ef0