[automerger skipped] Merge "AudioFlinger: Use std::any for the event cookie" into main am: 3051325d am: b0fad4b0 -s ours

am skip reason: Merged-In Iaa535450550681517613310a7043526be38c2aae with SHA-1 ec6d5058 is already in history

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



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