Merge "drm: fix error atom plumbing" am: c835b4487d

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

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