Merge "Merge history of frameworks/opt/net/wifi" into rvc-qpr-dev-plus-aosp