Merge "Make the output CryptoInfo.iv non-null" into rvc-dev am: da8620b7 am: 9a9957dc am: a2d4ebc0 am: 775eb82c

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

Change-Id: Ie4040a3595627ed32decaf411431be547e2f4165