[automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: b7c5457ce8 -s ours am: 908d3fae61 -s ours am: 8a0a38ebf1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7275688e991416fc21a025a32fe16560dc61b6bf