Android 13.0.0 Release 41 (TQ2A.230405.003.E1)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L87300000959339500.
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a

Change-Id: Ieecf6c076245eab8eff5628c386dd220be4306bc