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

* security-aosp-pi-release:
  Fix double free of play policy in a race condition.
  [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr  overflow.

Change-Id: I64225a4e1e02c2cede1af5de29f057d2f94f96b7