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

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

Change-Id: If95edd50638d7ec100c654f859dff9e295907b11