Merge "MediaCodec: check for exceptions when creating crypto info" am: 2f222457a2 am: b03acdec6c

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

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