tree 27858b034cc40310741cfa0119352aad7a0270b2
parent b761629fe52e3f9079e39618a72dc70a7cb05a2a
parent 5fd92817886c929a8bd2ca51582388abc4fcb756
author Ke-Yu Lu <lukeyu@google.com> 1707202767 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707202767 +0000

Merge changes from topic "revert-2925209-KVPWEBRQHT" into main am: 196d9493c4 am: 5fd9281788

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952266

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