Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b74 am: a79ec4979e am: 39be5b6a43 am: 24d6288ad5

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

Change-Id: Id9383b505734380db7e2bdf3861b78a5694dd676