Merge cherrypicks of ['partner-android-review.googlesource.com/3124659'] into android14-gs-pixel-6.1-25Q2-d-release.

Change-Id: Ibc2bffad324bec6af38478dbc66d1f59028480a5
Signed-off-by: Coastguard Worker <[email protected]>