Merge tag 'android-13.0.0_r32' into int/13/fp3

Android 13.0.0 release 32

* tag 'android-13.0.0_r32':
  Cherry pick the following two CLs from upstream
  Cherry pick the following two CLs from upstream

Change-Id: I001fc2a70b3f2b58cafad0d87c83fc969995038f