[automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 -s ours am: 5f8afc1e8e -s ours am: 047b281e6a -s ours am: 60a5086e4a -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history
Change-Id: If7351b4a10ad73c9374732236ac14992602e529d
This commit is contained in: