[automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 1cc3f4a438 am: c7e9470b06 am: b185a77dc0 -s ours am: 38ba2bbe6f -s ours

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

Change-Id: I43de5916fedb763e037b721683b53d40275920f7