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

Change-Id: I9cc8a7226b8756debbe2cb5e6f39f38c80c4e3b8