Merge history of frameworks/opt/net/wifi

BUG: 137323948
TEST: TH
Merged-In: Idd663a60a09fa60cdb6aab58c3505f9344eb91c9
Change-Id: Ifd388eb1034436b9c17b3d39c0772cccc450a11d