[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 -s ours am: 39104d5e -s ours am: 4f9273f8 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 ca241694 is in history
Change-Id: Icaa6bfc0f875883e036d4586a5f48165561583db