[automerger skipped] Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" am: 5b5889fc63 -s ours
am: e02370196f -s ours
am skip reason: change_id If70d917cfb3d825f375d282012b8788d69a2f144 with SHA1 499881f1da is in history

Change-Id: Ie5896d6f3dfa313574d65681131d00f6bb16e6b3