Android 13.0.0 Release 69 (TQ3A.230805.001.A2)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22381002', 'googleplex-android-review.googlesource.com/23661867'] into sparse-10317220-L65500000961600299.
SPARSE_CHANGE: I7b3dcd06e7483fde745a1d56dfee7c4efc262ed7
SPARSE_CHANGE: Ifcdac241bfe33f44f5f03f1a6db682c57f0cd388

Change-Id: I1bb3331bf5553f9a1984dd7eb2c29d94651e8a14