Merge "Add RINGTONE to Vehicle HAL AUDIO_FOCUS" into oc-mr1-dev
am: b58c3ccdde

Change-Id: Ie9a8c884fa970ac3141d2bd6288559ddea458dcf