resolve merge conflicts of af840b5 to master

Change-Id: I8a31d08dae71d5cb71ae01c06ead4ebf32f89121

diff --cc src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index e148638,1eb409b..e29f480
--- 1/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
--- 2/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@@ -778,8 -775,8 +786,8 @@@ public class PrivateVolumeSettings exte
          }
      }
  
 -    public static class OtherInfoFragment extends DialogFragment {
 +    public static class OtherInfoFragment extends InstrumentedDialogFragment {
-         public static void show(Fragment parent, String title, VolumeInfo sharedVol) {
+         public static void show(Fragment parent, String title, VolumeInfo sharedVol, int userId) {
              if (!parent.isAdded()) return;
  
              final OtherInfoFragment dialog = new OtherInfoFragment();