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

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

Change-Id: Ibdfa0189a9b7608dfcfe3a40ed3fd84150372c19