Merge "[automerger skipped] Merge "Unbreak tethering for no offload supported...

Merge "[automerger skipped] Merge "Unbreak tethering for no offload supported devices" into rvc-dev am: 48a2ffac am: 182fea42 -s ours" into rvc-d1-dev-plus-aosp am: dfa94b9c -s ours

am skip reason: Change-Id Ie0a32a9062c722327a27c6de13e3bb8d9588bebb with SHA-1 dbe4fa1f is in history

Change-Id: If53689a49ba65ab26b9b30505e994355eb90f932