tree 951de3efe394bfeb86a09c79e0f42f775bc4820d
parent cad74d8282e2e34bb689fb877e911c4a7d42a762
parent 84c590f895ad0087f57eb13522853926cefae72c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1694123757 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1694123757 +0000

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

Change-Id: I4cf6ba9e1aa0834396e6fb68d829d7129b22dab4