Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f am: 6ab81ec60a

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

Change-Id: Ibdfa0189a9b7608dfcfe3a40ed3fd84150372c19
tree: ad35f252909e68aa9dfd8e929d0f679b3db276f0
  1. Tethering/