Merge "fix some moved code from revert of aosp/2518976" into main am:...

Merge "fix some moved code from revert of aosp/2518976" into main am: 9301b11e am: 44fb88a4 am: 1ea8af36

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



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