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

Change-Id: I95284107f41b8bc4f4eae0870796f85a8b0b178b