Merge "Fix inverted error message" am: 8f33dcc9e3 am: b8cc59cfd3 am: ee9c499267 am: 9870ab1cab

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

Change-Id: If75dd147b3234c04386625f901596bb0e77356a5