Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 2e710d4981 am: 906dfb91f2

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

Change-Id: Ic2e007688e9d6c85729d4e159d53dcd1eb2f3f03
tree: 3c2e69194905b152c2bcf2f7633aa3b33043c6a6
  1. framework/
  2. service/