Merge "MediaCodec: check for exceptions when creating crypto info" am:...

Merge "MediaCodec: check for exceptions when creating crypto info" am: 2f222457 am: b03acdec am: eb3cb40d

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



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