Merge "MediaCodec: throw CryptoException with more error info" am: 4cbe13c73f

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

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