Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b74 am: a79ec4979e am: d8e4e24521 am: f6f58cce56

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

Change-Id: I4f2c5014e1b4b0dd88a8d93b9efc848c46b57ae4