[automerger skipped] [DO NOT MERGE] Prevent extra sessions owned by staged install from living across restarts am: 4d60cca9 am: e0083d78 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaad1e68c969e7584189f9f3281a860e3da355e5b