Merge "Simplify module visibility post build refactor" into stage-aosp-master...

Merge "Simplify module visibility post build refactor" into stage-aosp-master am: 1d35b7bc am: 0dc6f237 am: 476209a6 am: 6bb68d7b

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

Change-Id: I17a53b8879902fdf66f434b3115391a79c8d95dd