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

Change-Id: Ib555058e7fc1e36124b7537bec27b1e0312c58da