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

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

Change-Id: Iec3469dc5d66f4a140bd91ebe1395db9b1a85440