[automerger skipped] Merge "Do not support direct effect when the non-offload...

[automerger skipped] Merge "Do not support direct effect when the non-offload effect is enabled" am: 6f06559d am: 7aec4050 am: 50836f85 am: 7bc2bc9d -s ours

am skip reason: Merged-In Ifa83be883c81925a757fd121f51c5d476fb9cdf8 with SHA-1 76e69571 is already in history

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



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