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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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