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

* security-aosp-pi-release:
  Do not modify vector after getting references

Change-Id: I6be06a35a91061480826da9b4be5c34937479aee