Merge "configs: Add prop override for acdb on GVM"