Merge "Simplify module visibility post build refactor" into stage-aosp-master am: 26012f5baa am: 7912d4176c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/12520584

Change-Id: Ic5fed1c38eccd50c4a45374a8ef86913dfb97018