Move .idea style file to the new world.

It seems that Studio rebased to new IJ and IJ changed their code style
format. I manually tried to copy as much as I could over, but a bunch
of things just keep getting erased by Studio, so I'm guessing the names
of some of the options have changed.

Test: open studio and see code style settings (it now has proper import order)
Change-Id: If2caf33adb436ed458cdca9821b4e991a2041959

diff --git a/.gitignore b/.gitignore
index ac3565c..0b611c5 100644
--- a/.gitignore
+++ b/.gitignore

@@ -4,6 +4,9 @@
 **/.idea/**
 !**/.idea/codeStyleSettings.xml
 !**/.idea/copyright
+!**/.idea/codeStyles
+!.idea/codeStyles/Project.xml
+!.idea/codeStyles/codeStyleConfig.xml
 !.idea/copyright/AndroidCopyright.xml
 !.idea/copyright/profiles_settings.xml
 !.idea/vcs.xml