[automerger skipped] Merge "Remove android.media.* AIDL libs from VNDK" into...

[automerger skipped] Merge "Remove android.media.* AIDL libs from VNDK" into tm-dev-plus-aosp am: b8e3ad6e am: b9c60c92 am: 5018b05d -s ours

am skip reason: Merged-In I8e177d32852b548645a8bd1d7b7bb8a128c7b0bc with SHA-1 7746c0e1 is already in history

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



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