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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie49e4f4e37439aab3ab1bd5e649c1d84cbc3ce8c