[automerger skipped] Merge "Mark DDS PhoneAccount as CAPABILITY_EMERGENCY_PREFERRED" am: 628cd1a629 -s ours am: d3af1ced7b -s ours am: cdfb5e6d29 -s ours
am: ee5c0a0cb3 -s ours
am skip reason: change_id Ia01416069eeceb3a8e01b7e2aa0121b2ab43289c with SHA1 cde27691e3 is in history

Change-Id: I4fb51fa57d6f603544a22bd27e813a809a39f11a