am 5af6cbe4: am 7daffe56: Merge "Protect against ClassCastException in PstnIncomingCallNotifier" into lmp-dev

* commit '5af6cbe45c4314ec4e81bff5624b80003588bb67':
  Protect against ClassCastException in PstnIncomingCallNotifier