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

Change-Id: I7ee30e4cf7927ac289baca02b9baaf66871fb1bd