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

[automerger skipped] Merge "soong_config: bool_variables shortcut" into rvc-dev am: 909eaf52 -s ours am: 8f2c40e7 -s ours am: 9d7df0bb -s ours am: 8ecfb334 -s ours

am skip reason: Change-Id If5455a38433431c7ecbce1e5b32cfbb47f42602a with SHA-1 2b8b89cf is in history

Change-Id: I9c7a374c5422c34da522b1d53170e1d65b60cab9