Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 8b5a29a30f -s ours" into rvc-d1-dev-plus-aosp am: c291f57f0d -s ours

am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 2ecd333f59 is in history

Change-Id: Ie5fd4fd7a00935b82a1e253a190cf3ce3369adcb
tree: 26813e4744dc715f3f3d32b10a8f081232ca0346
  1. Tethering/