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