Merge "carrier default app notification polish" am: b2bb98e62d am: 921a49f7f8
am: 7c825ee40d

Change-Id: I2542b486de47071837407d1bb94ba89da0fb283a