Merge "Rewrite how we abandon sessions" am: f9e818047f am: 7fdd370876

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

Change-Id: Iba8e770c40c83c1d65df496b88410ba07ef73753