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

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

Change-Id: Iefe68dcc8f1c2fa049ca82337e518b65bcbe4d9a