[automerger skipped] Merge "Modify threshold parameters for signal strength...
[automerger skipped] Merge "Modify threshold parameters for signal strength reporting criteria" am: a6fc84d5 am: 69db7ac3 am: f1818a3d -s ours
am skip reason: Change-Id I53dafb17dc9fa4d381dc8876f8420275096449c3 with SHA-1 ae51f9eb is in history
Change-Id: Idece0f9530c1db7500e279e781d79b813d7a9bf3