Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FP2-221: There is no headset icon in guest mode after headset plugging in.
diff --git a/src/com/android/server/telecom/TtyManager.java b/src/com/android/server/telecom/TtyManager.java
index 35240c0..f6c9926 100644
--- a/src/com/android/server/telecom/TtyManager.java
+++ b/src/com/android/server/telecom/TtyManager.java
@@ -142,7 +142,8 @@
         PendingIntent pi = PendingIntent.getActivity(mContext, 0, intent, 0);
 
         notification.setLatestEventInfo(mContext, titleText, expandedText, pi);
-        mNotificationManager.notify(HEADSET_PLUGIN_NOTIFICATION, notification);
+        Log.v(TtyManager.this, "HEADSET_PLUGIN_NOTIFICATION... notification = " + notification);
+        mNotificationManager.notifyAsUser(null, HEADSET_PLUGIN_NOTIFICATION, notification, UserHandle.ALL);
     }
 
     void cancelHeadSetPlugin() {