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

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

Change-Id: I327ab5db55a012f7160e8c3a961f2d58ea37c6d4