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

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

Change-Id: Ia421bad5eb2b72abb737a39e76ab81013e3f0a1a
tree: 21fb3ca049184a0b8c41c28d63418e30d697e9ea
  1. framework/
  2. service/