Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  Fix UAF problem in wificond

Change-Id: I4d4f0e160048a7ffb67dfde261c8f24a5f5a032e