Android 15.0.0 Release 36 (BP1A.250505.005.D1)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/31035549'] into 25Q1-release.

Change-Id: I86eea9508a50a27fefb0346cd271e64a49836e0a