Merge "Fix unexpected crashed phone app notification when use system dialer as default dialer." am: aaabe1e078 am: bca7b458e3

Change-Id: I6abb44f58a7f53910932600b5418ad3dd071cb3c