Merge "Add sort order to PhoneAccounts extras" am: fe8a4c8ce8 am: 0b3d75f15f
am: d41ae11403

Change-Id: I376f8dd64423f0b5294e38b21e4bc8e52bdddc23