Merge "Simplify module visibility post build refactor" into stage-aosp-master am: 90059ee41e am: a75d8b04c4 am: 9eab5e65f2

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

Change-Id: I8934625a2356f7cf7769d8685e0c8e08a22be292
tree: fb1320bec3ded6d2f373570b5d8cfe44cef4f232
  1. framework/
  2. OsuLogin/
  3. OWNERS