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

* security-aosp-pi-release:
  [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability.
  [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow.

Change-Id: I581cb2c5190eea2fdbc0e398dbde064126e9d852