Merge changes from topic "recovery_soong_export" into main am: 077cb63f am: c0f8cfda

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



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