[automerger skipped] Merge "media jni: fix CryptoException error code to...

[automerger skipped] Merge "media jni: fix CryptoException error code to string" am: 9feb61d1 am: 95422454 -s ours am: b0656ee2 -s ours am: 88b87e7b -s ours am: b8f103ae -s ours

am skip reason: Merged-In I1ee13a2e91d925082261880bfe48d58f2b8b3109 with SHA-1 390b6153 is already in history

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



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