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