[automerger skipped] Merge "Clean up the visibility rules for framework modules" am: 415e2387ae am: 94261519be -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: I2e263560749dc0cc89ed1a73d5266551afbe5e49
tree: 16eacf6bf9b6d168892bb179830f8a6c31db198b
  1. Tethering/