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

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



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