Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 am: 35117a7596 am: 815d4cedea

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

Change-Id: I49a731122e7bdf8498ed00a30568a71cf66cad47