Merge "Make the output CryptoInfo.iv non-null" into rvc-dev am: da8620b7f7 am: 1fbebbe5a7 am: 61e37ad004

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

Change-Id: Idb3c1d73e95cae7ca8a57930a78bfab764803a3c