Merge \"Add DeviceDefault style used by ringtone picker.\" into nyc-mr1-dev
am: 411b9c69a1

Change-Id: I8742ff9342285bfb72f7f8cf68226a0d46d6d880