tree 5687ede29c1eaaeb9012445d98e3db306d50b51b
parent b924faf4c6da8d1b27318080f5157d4616e4a7a3
parent ee3b4c119a8371677ba59cfb7320c1c0c69b4235
author Ian Baker <ibaker@google.com> 1731953411 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1731953411 +0000

Merge changes I5aa04b0c,I9168db08 into main am: ee3b4c119a

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/3350988

Change-Id: I6b164453315e84f2fc8fbeb906dd2bfe14de1db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>