Merge "Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456 am: f243a65531" into rvc-d1-dev-plus-aosp am: 89230707cf am: 1ad9df62dd

Change-Id: I4ec5151a20e272153c27fa1b9ee345cf399268fb
tree: abd4c8b2cdf1a714aebfa3866128ec4107088cf7
  1. Tethering/