Merge "Add sort order extra for phoneaccount" am: 78d3f9e1f5 am: bd4140a945
am: 9001d22999

Change-Id: I903198c9b488bc2571f4cfba8ffd25fe15b7260d