[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: 1fb27324bb -s ours am: 3efe13b0a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I26e1c3f96c22d76b66db5f90c3ab1c64b5a711b5