Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am: 99cf40a25a
am: 3818d4187c

Change-Id: Iafc7ccd9bdd120100ae4063d72379479693142f9