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

Change-Id: I343b1a949f2382b61bb7d2b72ef459123d733fc0
tree: 1babb1db341de1fd7a72132a91fbf8c92cd6fada
  1. Tethering/