Merge "Merge history of frameworks/opt/net/wifi" into stage-aosp-master