Merge "Fix misleading phrasing of notification message for crashed phone apps and show phone app name in notification." am: 3cc519dc4a am: 1b2f0987cf am: 4f80044bd3

Change-Id: I843afe2a917fd9dcd322f970f7013bcc96abe000