[automerger skipped] Merge "When adding bluetooth phone account as emergency...

[automerger skipped] Merge "When adding bluetooth phone account as emergency capable, also list it for multi user" into qt-dev
am: 648f8a4d -s ours
am skip reason: change_id Ibe297d30f713534e0977aac5a95543053aac9f9d with SHA1 d6f0e837 is in history

Change-Id: I872de35b7f38d6e9cfd9c4b8de48444f17c8474a