[automerger skipped] Merge "Allow testing of signal strength" into rvc-dev am: 4947356664 am: bca0babd92 -s ours am: 70d1decc19 -s ours am: d3bdebdda8 -s ours
am skip reason: Change-Id I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21 with SHA-1 cbc7c5b171 is in history
Change-Id: I16c2c4d932bc2e9be5b5bcb8b8fc5ca44761387b
This commit is contained in: