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

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

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