[automerger skipped] Merge "Replace PhoneStateListener @hide constructors with public ones." am: 18841a20 am: c6a38b41 am: 7d613c0c -s ours
am skip reason: Change-Id I96938b169ea687fa3c7474c00ec0de4a0e55bd90 with SHA-1 57c9b696 is in history
Change-Id: I067d8da3d2448fa02ca1f921caf9db1d436ea116