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