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

* security-aosp-pi-release:
  DO NOT MERGE Fix floating point to text conversion overflow

Change-Id: I6036bfc2d1b29278ed2bafd43b114766a020271f