Merge "Keystore 2.0 SPI: Fix bug in chunked streamer." am: 3af57cab am: 4b1f565f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c8004df6a99e86e80b0d6476ed70c28d13a6932