Optionally make VICs bubble

Test: atest
Bug: 149696991
Change-Id: Iec86ac860a51bcecde70d7abd7feeb5f9319ebfa
3 files changed