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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6dd2fc4918b0264c08135036a56d06f9408031b5