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':
  Cherry-pick one upstream patch
  Cherry-pick one upstream patch
  Cherry-pick one upstream patch
  Cherry-pick one upstream patch
  Cherry-pick one upstream patch
  Cherry-pick one upstream patch
  Cherry-pick one upstream patch

Change-Id: I253e719c5821f9f9ca8601e32d7cda1647879b22