[automerger skipped] Merge "Allow staging multiple session with non-overlapping packages (apk-only)" am: 78200303 am: 65421fe4 -s ours
am skip reason: Change-Id Iad2e35b50fd22e207e3ad91b48a767827d8e8926 with SHA-1 da00497f is in history
Change-Id: I498c276f44270cf75b5229e3b9e7ce65faafb4cf