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

Change-Id: Ia093d94fdeb7b7068391d082b28781a29cb0f6a0