[automerger skipped] Merge "AudioPolicyEffects: Remove KeyedVector" into main am: 519c137523 am: c80a29b1bc -s ours

am skip reason: Merged-In I2ba2fd632bbbffa447c80d1c9277fbd9f267fc49 with SHA-1 43119fb09b is already in history

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

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