Merge "Populate drm error details from aidl HAL" am: e400e2107b am: 9021a781d8

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

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