Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b74 am: 308851ebde am: ca3ce05d43

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

Change-Id: I385f0f10d9eb34bd9e4c61632669cd6d44ec5568