Merge "Merge "Allow staging multi-package session immediately after...

Merge "Merge "Allow staging multi-package session immediately after abandonment" into rvc-dev am: fb11084b am: 6fc87a62" into rvc-d1-dev-plus-aosp am: 5800ac6b am: 6dbc3481

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911051

Change-Id: I2160df030449202217e98caad9e04175543f7025