Merge \"Cache old VM ringtone name to avoid stutter in settings dialog\" into nyc-mr1-dev
am: 0c34424c65

Change-Id: Idb4085c1862986669c21ae414d7bded71db852ef