[automerger skipped] Merge "Add a separate namespace for Tethering module."...

[automerger skipped] Merge "Add a separate namespace for Tethering module." am: 8f2ec1df am: 2300efc2 am: 421813d4 am: b3920be9 am: adde6710 -s ours

am skip reason: Merged-In I393d25f4c1a15927686c984e47c01f2646d0867d with SHA-1 e5fea201 is already in history

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

Change-Id: I4d601c3e2a6f9d193c36bde0b3a51f732155d47b