[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: b8f14a7db5 -s ours am: 3df34b9f6a -s ours am: 3e4479c382 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie2e5c3f43076aa0cac85be5fe9be0d6b3c6d0bcd