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

* security-aosp-pi-release:
  audio HAL - fix UAFs

Change-Id: I4cf0d75b2d7c8828ef64d945740078020ec9f605