Merge "Correct name of gitattributes file" am: 2408a23918 am: 4a66f09d1f

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2018055

Change-Id: I93d591403ef48bb799a492d8fc27323802d0eca6