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

Change-Id: I423d4b0f1370a9a2ddb844cdfef6f7f3c101c120