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

Change-Id: I6b60e612f34ed43c3d4727d6d92aac5805843d2e