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

Change-Id: If736e36d0ac6b1a18a7b55b085134c7bf9aede4a