[automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 am: 433c8ff695 -s ours am: dbd0a403a2 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 6b59b8fbcc is in history
Change-Id: I8d942691d1032e6567407b19c72d194274d38c5b
This commit is contained in: