Revert "Hacky workaround for half-finalized builds." am: 3cdd3519

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



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