Merge history of frameworks/opt/net/wifi

BUG: 137323948
TEST: TH
Merged-In: I6610b2ea3395a62311894489196ef0cdc8e14afd
Change-Id: Icfd7f8fb632e8c7dbd61d13d06792b254cca57eb
Exempt-From-Owner-Approval: Migration CL