Merge "polish the notification of the default carrier app" am: b224b318a0
am: 64e0d4553b

Change-Id: I12f02f834aef5928354e6afed560db60ddf2a284