[automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a7 am: 9c6bc472 -s ours am: 65cf3949 -s ours am: 102e8bf3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I61a202e8b1639470cc142c107ffde60e061f4d7a