Iteration on multi-user storage UI.

Adds headers to distinguish between current and other users.  Also
correctly orders color chips.

Bug: 7003520
Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c

src/com/android/settings/deviceinfo/Memory.java

@@ -101,8 +101,7 @@ public class Memory extends SettingsPreferenceFragment {
 
     private void addCategoryForVolume(StorageVolume volume) {
         final StorageVolumePreferenceCategory category = new StorageVolumePreferenceCategory(
-                getActivity(), volume, mStorageManager);
-        // TODO: if primary emulated storage, then insert split items
+                getActivity(), volume);
         mCategories.add(category);
         getPreferenceScreen().addPreference(category);
         category.init();