[automerger skipped] Merge "Support always reporting signal strength phone state listener" am: 260a0aac29 am: 0aa382e588 am: 0ff288575a -s ours
am skip reason: Change-Id Iaee832c75b29d89dbc9e5c6659e1a7e89c4a467f with SHA-1 93642d4433 is in history

Change-Id: Ic954ea874d8989f3640a04520e4d8e4534b35c39