[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must...

[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb am: a68d6034 -s ours am: 80dc50df -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4150b87507d7dfdfcaec394a300e252ea0e2f907