tree 7fa67691c707322737b423ce20d47e1036033572
parent ebc9d400fe4f87a8f1792dcef54a21b54553d189
parent 583d8e436b1c2b582765bb54dd8ad8d719c255ff
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1699641034 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1699641034 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24956689'] into security-aosp-rvc-release.

Change-Id: I6ab8497f7937f8757e7dae914124b56970856b2a