[automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 -s ours am: e49e3dd8d6 -s ours

am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 fd8b4bbe35 is in history

Change-Id: I66d4cca9205a4e56f15edb92f9772127d7c2535d
tree: 760986c767d76f3d6cbf419f34c21ce72a1b44d7
  1. Tethering/