Merge the 2020-05-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Targeted minimal fix for security issue in CVE-2020-9589.

Change-Id: I9ab5b37934109743714ee3ca5e0c882df65cda4d