Merge "MediaDrm: throw exceptions with extra info" am: c0d6224bd2 am: 27946cfbef am: ec5693e013

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

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