Merge history of frameworks/opt/net/wifi

BUG: 137323948
TEST: TH
Merged-In: I6e860f173f53f797a90b25d48762423e8d5fb3b6
Change-Id: Ibe4cc816db2e9ac048e69722f7648f432980957e