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

Change-Id: Ia630ef6f7c6553fe7e97c44e446847cc215af937