Merge changes from topic "am-c4af3eefdcdc419fb2f54eacb2b2ac35" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb am: a68d6034 -s ours am: 80dc50df -s ours am: 6e4e897c -s ours am: fd07e6b3 -s ours
  [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a7 am: 9c6bc472 -s ours am: 65cf3949 -s ours am: 102e8bf3 -s ours am: e0bffe2a -s ours