Merge "Disable() must not be enabled unexpectedly" am: 6aed6a385e

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

Change-Id: I2872ee13bb99315cf725ea442c400f083e172c12