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

Change-Id: Id599ba9fe2eda07569204956730d0ec78b4272f4