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

* security-aosp-pi-release:
  NFC - Memory disclosure in rw_i93_sm_format

Change-Id: I4b7367fd5076c99f3fe9aa75b4caf45e49c02bff