Merge "Compile android-non-updatable with framework-tethering module-lib stub" am: 1176dd4409 am: 9a542a9799 am: e95587d1ca

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

Change-Id: I050c42b46b475e058796ea483df27f644b5ab16f