Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63

Change-Id: I87c8cc92a78ba7bd17581c23e1603ac47391e96e
tree: b953a372c81aff4513364f5ac1401290511732a4
  1. Tethering/