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

Change-Id: I0bceaab31760e89eb0968561b4358adbc4aec724