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

Change-Id: I8780a5fb1a675d31d0ef4dcfe7bc5fd740a602fe