Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def973

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



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