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

Merge "Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa am: 31172269 -s ours" into rvc-d1-dev-plus-aosp am: 6a1089f2 -s ours" into rvc-qpr-dev-plus-aosp am: 6d0759a9 -s ours

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

Change-Id: I794a70c9efc425ca83b4b0c02f587deef7d75f72