Android Mainline 12.0.0 Release 83 (8339063,com.google.android.wifi)
Merge cherrypicks of [16852721] into sparse-8093120-L69200000953150821.

Change-Id: I353bd1c981da21448fc717d32aa06871fc9460b7