Merge "drm: fix error atom plumbing" am: c835b4487d am: 26919473da am: b6c7c1b242

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

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