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

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

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