tree c5efad4f98f77d7e8fd05ec9a4ec8dc62ba2bb4f
parent b4366b772a03c35a92e0199c130b3f351bdfc6cf
parent 2050055d70646b2b54fc5b6e65ceaca6e1ef6cbb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711392122 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711392122 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26405624', 'googleplex-android-review.googlesource.com/26663317'] into 24Q2-release.

Change-Id: Id43b14a6898e01083aeb6419a1fd8f1f4104564a