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

Change-Id: I541d0bf6c370b952e0e725960187e55ecc9e9ac7