Merge "Update .gitignore to better deal with .idea files." into nyc-support-25.2-dev
am: ac13686b90

Change-Id: I744c396cc3098502961af6816944ca7bccf6bd67