[automerger skipped] Merge "Revert "Deprecate support for legacy effect config...

[automerger skipped] Merge "Revert "Deprecate support for legacy effect config file audio_effects.conf"" am: 3c6135e9 am: dcddec4e am: f35df28a -s ours

am skip reason: Merged-In Id3ec0934333aea174ab7469887a6d7bf416f2a42 with SHA-1 c11621e6 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2585165

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



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