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

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

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