[automerger skipped] Merge "Clean up the visibility rules for framework modules" am: 415e2387 am: c0cc6209 -s ours am: ad2ab1cf -s ours am: fb8620fa -s ours

am skip reason: Change-Id Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640 with SHA-1 dde22307 is in history

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

Change-Id: Ic617b73d9a48f814f65911f05d58b9bc70a7eeda