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

Change-Id: I67c3f85dc7407fe1414763df3c173401986c0b64