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

* security-aosp-pi-release:
  DO NOT MERGE

Change-Id: Ide3f90c8d55a39d13a99f20031e6fd0d39ed36e9