Merge "When adding bluetooth phone account as emergency capable, also list it for multi user"
am: 4336d92e75

Change-Id: I8b2f7591c5fd9b85cb932711cd6f023183bef613