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

[automerger skipped] Merge "soong_config: bool_variables shortcut" into rvc-dev am: 909eaf52 am: ec24e79c -s ours am: 0e916127 -s ours am: ef71a510 -s ours

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

Change-Id: I10e503e36d70501841fb1fab6d3475d633627c71