Merge "When adding bluetooth phone account as emergency capable, also list it for multi user" into qt-dev

am: 648f8a4

Change-Id: Idff8702334ada0e9cd5974b17405264e3aca52dd

Author: deqiangc

src/com/android/bluetooth/hfpclient/connserv/HfpClientConnectionService.java

@@ -335,6 +335,10 @@ public static PhoneAccount createAccount(Context context, BluetoothDevice device
                 .hfp_client_connection_service_support_emergency_call)) {
             // Need to have an emergency call capability to place emergency call
             capabilities |= PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS;
+            // Emergency call is processed in user 0 context in multi-user setting
+            // even if caller is from another user. Declare multi user
+            // capability for the account to be chosen.
+            capabilities |= PhoneAccount.CAPABILITY_MULTI_USER;
         }
 
         PhoneAccount account =