[automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate...

[automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a7 am: b7c5457c -s ours am: 908d3fae -s ours am: 8a0a38eb -s ours am: f707c44d -s ours am: 230fc462 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic1c73fdc11444493fafefc996ff67f8639afa230