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

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

Change-Id: Ice5223cde0d9a3de8d4c09f11efba8e5ac13eb8d