Merge "drm: fix error atom plumbing" am: c835b448 am: 26919473 am:...

Merge "drm: fix error atom plumbing" am: c835b448 am: 26919473 am: b6c7c1b2 am: 0abc5c74 am: 954c3019

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



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