Merge "Revert "Add support for Generic Telephone Bearer service (GTBS)"" am: 44924b17d1

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

Change-Id: I1b3b6c292afb593a6d37c6461547ef976c865d7e