Merge "Rewrite how we abandon sessions" am: f9e818047f

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

Change-Id: I42a249be96a06f4c99ed38486d5cb64d501b72cd