[automerger skipped] Merge "Rewrite how we abandon sessions" am: f9e81804...

[automerger skipped] Merge "Rewrite how we abandon sessions" am: f9e81804 am: 7fdd3708 am: 208826a5 -s ours

am skip reason: Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 e3a71c62 is in history

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

Change-Id: I44e02f2b87074dbca109309eda28cdd8fa07cbb2