Merge history of frameworks/opt/net/wifi

BUG: 137323948
TEST: TH
Merged-In: I5185b74dae42f62194bac2cb10ea536d99632a7a
Change-Id: I9ac4a7caeb539a1ee947876afc0f30dd41fc2409