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

Change-Id: I318953e330252694fb64cde9d2f5e8a540384a1c