Merge "Tweak change voicemail PIN UI" into nyc-mr1-dev
am: 2615d6e93d

Change-Id: Ia7ff0eb21460707d9400dca69072741f320b8977