Merge "MediaDrm: error detail apis" am: 854155d3f4 am: cdba3c36f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359442

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