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

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

Change-Id: I670a844713037354d8a147f506ba6fc4eeca09ea