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

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

Change-Id: Ief4d253b0219f9d78b24f53be4b4c3fbebb26d02