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

[automerger skipped] Merge "Unbreak tethering for no offload supported devices" into rvc-dev am: 48a2ffac -s ours am: d426cce1 -s ours am: dd010a95 -s ours am: 1075a9ee -s ours

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

Change-Id: I40ec8bb75ddc23c179c40d6e6ce7ecf07edd15e5