Merge "Replaces 'oneshot' and 'interface' with 'onrestart restart audioserver'." am: 5bb99e24ad am: 3a6c4696bd
am: 1fd3dbe764

Change-Id: Icf7852d9b75a42df53a628301f8b037982a70122