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: 7be01449 am: cb0db6e7

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



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