[automerger skipped] Merge "audioserver: Makefile - remove unused entries"...

[automerger skipped] Merge "audioserver: Makefile - remove unused entries" into aosp-main-future am: 44fd6fc7 -s ours

am skip reason: Merged-In I84537d88ae93f15748ae4ee2833c41ac7a669b3a with SHA-1 fc77abca is already in history

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



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