[automerger skipped] Merge "libeffects: Fix to resolve glitch with disabling...

[automerger skipped] Merge "libeffects: Fix to resolve glitch with disabling LVCS" am: e874dd04 am: 6d43dbfb -s ours

am skip reason: Change-Id I27ad3d1a8e3b0f0ad32aaa538bf25850fb43ebe8 with SHA-1 d1b4d4b2 is in history

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

Change-Id: I2930101a51822712e788bf5dd0a517b10874afd5