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

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



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