[automerger skipped] Merge "soong_config: bool_variables shortcut" into...

[automerger skipped] Merge "soong_config: bool_variables shortcut" into rvc-dev am: 909eaf52 am: ec24e79c am: a07614aa am: b5cae552 -s ours am: b7a59202 -s ours

am skip reason: Change-Id If5455a38433431c7ecbce1e5b32cfbb47f42602a with SHA-1 1934adc0 is in history

Change-Id: I4ffd6621c491c6d21fad500818756873ae6ae515