Merge "wifi: Add capabilitiy flag for ND offload" am: ab16b319f4
am: b6eeb57609

Change-Id: I9935aa3b423acb24dbb5075d4ee0547aa495b872