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

Change-Id: Idb6513f6706bed29caa616aa08e3bd16778930ae