Merge history of frameworks/opt/net/wifi

BUG: 137323948
TEST: TH
Change-Id: I7b1d89eaa6277fad6bb248e01139b8c16a17b90e