Merge "Fix NPE in MissedCallNotifierImpl" am: 6fc722d72a am: 447332728c
am: 5363af3512

Change-Id: I859608408e44f79a9e726a6d39e83bd34a8e60e7