Merge cherrypicks of ['partner-android-review.googlesource.com/3027429'] into android14-gs-pixel-6.1-24Q4-release.

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