Merge "Remove usage of PhoneStateListener hidden API"