Merge "Make sure that textpb files are treated as text" am: e51b12abe7 am: d42e01a785 am: aa2884c8bf

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

Change-Id: I6569a32ca799c9f4d223a5a69efa30e2eec206cc