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

Change-Id: I4bb9f08d155def15a79a4960f05650cb5d7615fd