Merge "Do not depend on Tethering stubs in CM consts" am: b55fb561a8 am: 1fc4057bb0 am: 334df070a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie49e4f4e37439aab3ab1bd5e649c1d84cbc3ce8c
tree: be2512b60fcf9dd2271922d185027cd10a25eb49
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS