fixes after rebase

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -892,8 +892,7 @@ public class Preferences extends PreferenceActivity
             }
         }
     }
-
-    @NonNull
+    
     @Override
     @NonNull
     public MenuInflater getMenuInflater() {

src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java

@@ -30,7 +30,6 @@ import android.widget.Toast;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DeviceCredentialUtils;
 import com.owncloud.android.utils.DisplayUtils;
 
@@ -66,7 +65,6 @@ public class RequestCredentialsActivity extends Activity {
     @Override
     protected void onResume() {
         super.onResume();
-        AnalyticsUtils.setCurrentScreenName(this, SCREEN_NAME, TAG);
 
         if (DeviceCredentialUtils.areCredentialsAvailable(this)) {
             DeviceCredentialUtils.createKey(getApplicationContext());