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

Android 13.0.0 Release 67 (TQ3A.230805.001)

* tag 'android-13.0.0_r67':
  Cherrypick following three changes

Change-Id: Ifd32bbe6de81a7772b1e4ac414b251d1d9e2fcd6