Merge "Merge "Use alternative PhoneStateListener formal API" am: 45f58ae930 am: b0faafbcbc am: 5611936630" into sc-dev