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

* security-aosp-pi-release:
  Cherry-pick one upstream patch

Change-Id: I3680132d305950067febd94f29d1b686c6be4b8d