[automerger skipped] Merge "Tethering: ensure downstream prefix do not...

[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa -s ours am: 1ed6f017 -s ours am: 5185a028 -s ours am: ae86d8a0 -s ours

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

Change-Id: Ieb7c9f6255907b338fb67c4a583e1f70e29b42b1