Merge "Fix error message to still be an error." into main am: dbd4a25c am:...

Merge "Fix error message to still be an error." into main am: dbd4a25c am: 9f98477e am: 8dcd17af am: de74892e am: 98a01ec7

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



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