Merge "Add sort order to PhoneAccounts extras" am: fe8a4c8ce8 am: 0b3d75f15f am: d41ae11403
am: 373e3af8a7  -s ours

Change-Id: I7858c43f345f5697ea743cabd05bddb6197cb59b