Merge "Merge history of frameworks/opt/net/wifi" into mainline-prod