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

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