Merge "Simplify module visibility post build refactor" into stage-aosp-master am: 1d35b7bc

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

Change-Id: Iff37388324c3fb1e838c3c7ffc803b96d6e61197