[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours am: a6d948cf73 -s ours am: 0966a74414 -s ours am: 04b69e59e1 -s ours

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

Change-Id: Ieb7c9f6255907b338fb67c4a583e1f70e29b42b1
tree: 490c4100059f07595d69996a34899b5b33986627
  1. Tethering/