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

Change-Id: I8fdd1801c2e9db63daee78dcbe2c309ddbbe5f46