Android 15.0.0 Release 17 (AP4A.250205.002.C1)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780678', 'googleplex-android-review.googlesource.com/29911323'] into 24Q4-release. Change-Id: I46e720579fa71fd3620b6f228f20c702dd219ff8