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

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

Change-Id: I98d51b1595bed95f181f903781dacabaa90c0d00