[automerger skipped] Merge "Add eraser in EffectHalVersionCompatibilityTest" into main am: 9648c2dbd6 am: c948fa9e90 -s ours

am skip reason: Merged-In I1352e59dcfaab9e799a42f68d23108a8ecf4a8b8 with SHA-1 b04d02d390 is already in history

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

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