Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." am: 4844c2065b am: 8fa4c0f37e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95d001d6b04e826b8d3242e47ed6f1c31cbc7c26