[automerger skipped] Merge "Unbreak tethering for no offload supported devices" into rvc-dev am: 48a2ffac am: 182fea42 am: eabfad6b am: f614e757 -s ours am: 34ded983 -s ours

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

Change-Id: I601ead1420458c70b90f3f6178019ece641e7dd3