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

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



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