[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must...

[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb am: b8f14a7d -s ours am: 3df34b9f -s ours am: 0cd4b1c9 -s ours am: ed63a0dc -s ours am: e6317a9f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I12ba2d48b5a469a22f0476a6d2a1ed6832eee437