Merge "Merge "Add support for devices with no voicemail" into oreo-cts-dev am: 0f9b414ce4" into oreo-mr1-cts-dev