[automerger skipped] Merge "Add AIDL HAL server to audioserver.rc" am:...

[automerger skipped] Merge "Add AIDL HAL server to audioserver.rc" am: 04a0dc5a am: 103107a7 am: ca1b81be am: e3e0ae23 am: 9b94119e -s ours

am skip reason: Merged-In I8c8e4042b23a3ba94801d4bc9c0fb98192ea0fc8 with SHA-1 6aaffb46 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2190585



Change-Id: I65f53cdb5965c5cff0dcccf9ed0a184fb90c2688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>