Merge "Restore Parameters after audio server restart"
am: 93fd824732

Change-Id: If90547356c5cde9aa2281998360b3b2609dbe3fd