[automerger skipped] Merge "More default visibility for framework modules"...

[automerger skipped] Merge "More default visibility for framework modules" into mainline-prod am: db8cb822 -s ours

am skip reason: Change-Id Iadb1c8ba021aa5225d4f5ea13388e843ff846eaa with SHA-1 70882b5a is in history

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

Change-Id: I8afe773c4c7b7f6849336c1d0bc60d50a32fcb5a