Merge "Remove VVM configs from AOSP Dialer"