[automerger skipped] Merge "Remove mPhoneStateListener in PhoneSwitcher as...
[automerger skipped] Merge "Remove mPhoneStateListener in PhoneSwitcher as it's not used." am: 43af5b4a am: 0ed9462f -s ours
am skip reason: Change-Id Iac3e0ae1b12af87eddb013032281661b2daaef00 with SHA-1 5b8b87d1 is in history
Change-Id: Ife23e200fc960ea185cdc6612a3b2e8163edd97a