[automerger skipped] Merge "AudioFlinger: remove global effect enablement...

[automerger skipped] Merge "AudioFlinger: remove global effect enablement timeout" into main am: 6fb00c78 am: f8c556c3 -s ours

am skip reason: Merged-In I2fb7fe98df4dc63972511efe814841668d6645d3 with SHA-1 4995000d is already in history

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



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