Remove .idea/vcs.xml that is causing conflicts

Test: None
Change-Id: I789d71ea606c4580cf06936b1374094378f80032

Author: liutikas

.gitignore

@@ -10,7 +10,6 @@
 !.idea/copyright/AndroidCopyright.xml
 !.idea/copyright/profiles_settings.xml
 !.idea/inspectionProfiles/Project_Default.xml
-!.idea/vcs.xml
 .project
 .settings/
 project.properties