[automerger skipped] Merge "Clean up the visibility rules for framework modules" am: 415e2387ae am: 94261519be -s ours am: 42dea5b4ea -s ours am: 9d4fcfedc3 -s ours

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

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

Change-Id: Ic617b73d9a48f814f65911f05d58b9bc70a7eeda
tree: 16eacf6bf9b6d168892bb179830f8a6c31db198b
  1. Tethering/