Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa am: 31172269 Change-Id: Ia2ef3723c679114ecbdce4930834af5a22ddb85a