[automerger skipped] Put orphan effect chain back if orphan effect creation...

[automerger skipped] Put orphan effect chain back if orphan effect creation failed am: 5f074002 -s ours am: 4c15f317 -s ours

am skip reason: Merged-In I9b6d6c350106b233d3ea856bfa4df81ce35a54ec with SHA-1 0bc34d4d is already in history

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



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