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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab681af16a324dc1ebcade33649dec736b3bb4f4
tree: 42ed35db24b84c9a03cb6b0d7ab9f24da29a2fc7
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS