Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  DO NOT MERGE Fix CVE-2020-15358 and CVE-2020-13871
  DO NOT MERGE Fix floating point to text conversion overflow
  Update fix for issue 147928666.

Change-Id: I0a2c0053eabe90ae2c32f261482dcb881e70efe5