Merge "Merge "Make the output CryptoInfo.iv non-null" into rvc-dev am:...

Merge "Merge "Make the output CryptoInfo.iv non-null" into rvc-dev am: da8620b7 am: 1fbebbe5 am: 5b226d59" into rvc-qpr-dev-plus-aosp am: 0a1c0ac4

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

Change-Id: Ibdb305cdb0c4c5bbd7f9d1a303a773dbb96f20d0