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

* security-aosp-pi-release:
  Fix potential decrypt src pointer overflow.

Change-Id: Ia1d48035da32091449bc52ac6662b9a2dc7e4a0a