Merge the 2021-03-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Fix UAF problem in wificond

Change-Id: I1feaf37025eba1f17b306d24eca727f8e0d739e2