Merge "Protect against ClassCastException in PstnIncomingCallNotifier" into lmp-dev