[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: b8f14a7d -s ours am: 3df34b9f -s ours am: 0cd4b1c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1bbd077e14fb7a6e5bd883cad41460a08d6f2cc2