Merge "gtbs: Add Generic Telephone Bearer Service support" am: ddcee937c1 am: 66a9d57579

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942955

Change-Id: I4904d2a80075999d2a111d6fd671c308c80f3f9b