Merge changes from topic "am-cc5dc0744f944d90ae9d2d284d59e082" 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: b8f14a7d -s ours am: 3df34b9f -s ours am: 3e4479c3 -s ours am: 0ca6cfa5 -s ours
  [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: b5810960 -s ours