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

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



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