Merge "Populate drm error details from aidl HAL"