Android Mainline 12.0.0 Release 57 (7999070,com.google.android.wifi)
Merge cherrypicks of [16439367, 16439368] into sparse-7979684-L65400000952260471.

Change-Id: Iff63641708b7186956621e2016ddd9de8a33dd55