[automerger skipped] Audio service: Refactor register interface am: 350ce29826 am: c233ba068a
am: 42fc12708d -s ours
am skip reason: change_id Ib6b99d7a2c2079d914970fbe804aaf3c78c143ce with SHA1 5261dce877 is in history

Change-Id: I0197b0290413d9dbab5d2fde5928234a96ca8039