Merge \"Disable visual voicemail service on secondary user\" into nyc-mr1-dev
am: deefacc839

Change-Id: Ifb040bd3c404acc239d9037c055ed548851cab00