[automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am:...
[automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 49473566 am: 6340db9a -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 ca241694 is in history
Change-Id: Id16481c143b1aa83ca3e9b76fc5245e97b0f4ed8