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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I350d62c085f2e12fae8a3beb82779eeeed7afb45