[automerger skipped] Merge "Allow staging multiple session with non-overlapping packages (apk-only)" am: 78200303 am: 65421fe4 -s ours am: 059ca6e8 -s ours am: 3b010873 -s ours am: 667d7002 -s ours

am skip reason: Change-Id Iad2e35b50fd22e207e3ad91b48a767827d8e8926 with SHA-1 da00497f is in history

Change-Id: Ib9b4c1d5cd8d58a4610a5e376cc01c77bce448e0