Set the activity result for the watch's RingtonePickerActivity.
am: 385f237168

Change-Id: Id066da77b23b070ef8be0bef03e3786990ab92d4