[automerger skipped] Merge "Merge "fix streaming installation for splits" into...

[automerger skipped] Merge "Merge "fix streaming installation for splits" into rvc-dev am: 964f9fdd am: 576f55c3" into rvc-d1-dev-plus-aosp am: 51b548f7 -s ours am: 1ed0faf2 -s ours
am skip reason: Change-Id I704d1c479fdeb93c3c031bfa639f195979564139 with SHA-1 5f911c85 is in history

Change-Id: Ia765823d64d607a90cbb1d604b11634255cf300e