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

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

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