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

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

Change-Id: I8934625a2356f7cf7769d8685e0c8e08a22be292