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

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

Change-Id: I34b671e92b994fa856227e91bd1bc9fc8a8655de