Merge "Remove redundant vvm3_enabled bool" am: 93e359105a am: 0f8b67aa75 am: 302c0e4dd6

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1403567

Change-Id: Ic6cb0bd466b4215d0334cd1e54f4206a7e29fb4a