[automerger skipped] Merge "Simplify module visibility post build refactor" into mainline-prod am: b93b31ce -s ours

am skip reason: Change-Id Ibf35bfac5c99a21125f89ba10945f3364217b90f with SHA-1 46c47efc is in history

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

Change-Id: I8acb421d671287e193d5d462788b3342ed193131