[automerger skipped] Merge "Fix processing effect uuid null" into udc-qpr-dev...

[automerger skipped] Merge "Fix processing effect uuid null" into udc-qpr-dev am: d5caa7e6 -s ours am: 9c0dca30 -s ours

am skip reason: Merged-In I28436bb45431fdc2be2d8b82546d8b06d66e5108 with SHA-1 e708d97a is already in history

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



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