Merge "carrier default app notification polish"
am: b2bb98e62d

Change-Id: I78101dd7dc4bd7f222c5e6cc095b7179ce03f362