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

Change-Id: Idff8702334ada0e9cd5974b17405264e3aca52dd