tree ebd0f03b012d3e01b9ea82da2724698cbb959347
parent 2a54ad702ba42521947e9e2cf085f0b2bf76dc66
parent 1aed9f2ed754aa8b79ada3951f96ba6b46426611
author Treehugger Robot <treehugger-gerrit@google.com> 1596276720 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596276720 +0000

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

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

Change-Id: I1599af4cc889e8f105cfe5225f837b0fa2690cd8