Merge "Add support for Generic Telephone Bearer service (GTBS)" am: b8e22b665b am: 62e998f7ad am: 6ee60434a0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1942896

Change-Id: Ic948ef5efc7d77e9edceb00d4219eb7e1ca49866