Merge cherrypicks of ['partner-android-review.googlesource.com/3141249'] into android14-gs-pixel-6.1-25Q2-d-release. Change-Id: Ie47d33ff606d36df379b3617f3e662abf38304d2 Signed-off-by: Coastguard Worker <[email protected]>