resolve merge conflicts of 8e18934478 to master.

Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534

diff --cc src/com/android/settings/deviceinfo/Status.java
index 982f1c9,b52a0ad..6e0b690
--- 1/src/com/android/settings/deviceinfo/Status.java
--- 2/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@@ -199,9 -205,10 +199,11 @@@ public class Status extends Instrumente
              removePreferenceFromScreen(KEY_SERIAL_NUMBER);
          }
  
-         //Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
+         // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
+         // Also remove on Wi-Fi only devices.
 -        if (UserHandle.myUserId() != UserHandle.USER_OWNER
 +        //TODO: the bug above will surface in split system user mode.
-         if (!UserManager.get(this).isAdminUser()) {
++        if (!UserManager.get(this).isAdminUser()
+                 || Utils.isWifiOnly(this)) {
              removePreferenceFromScreen(KEY_SIM_STATUS);
              removePreferenceFromScreen(KEY_IMEI_INFO);
          }