Merge "Remove redundant vvm3_enabled bool" am: 93e359105a

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

Change-Id: I5423e520ca316106533f9aa9a3fa024ed0eb127a