Merge "Do not depend on Tethering stubs in CM consts" am: 3a865fa8ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab681af16a324dc1ebcade33649dec736b3bb4f4
tree: 4718c892d8624000e77c04a14f20a531548b7e72
  1. framework/
  2. service/
  3. OWNERS