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

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

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