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

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

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