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

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

Change-Id: I99ca97c91bf2f3705b7295d14f5ddb84d29c84c0