[automerger skipped] Merge "Rewrite how we abandon sessions" into...

[automerger skipped] Merge "Rewrite how we abandon sessions" into rvc-qpr-dev-plus-aosp am: f827bb5a -s ours

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

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

Change-Id: I7eef377a95650bf5d0f23f0b5d8ae0bb56288954