resolved conflicts for merge of 1adca55f to mnc-dr-dev

Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c

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

@@ -51,6 +51,7 @@ public class UsbModeChooserActivity extends Activity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
 
         mLayoutInflater = LayoutInflater.from(this);