[automerger skipped] Merge "soong_config: bool_variables shortcut" into rvc-dev am: 909eaf52 am: ec24e79c -s ours
am skip reason: Change-Id If5455a38433431c7ecbce1e5b32cfbb47f42602a with SHA-1 1934adc0 is in history
Change-Id: I93a22036a504b4a9728936f30a4cb258138cc60b