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

Change-Id: Ie6710669cf4c51c9f0fa9a25031a5441826bd300