[automerger skipped] Rewrite how we abandon sessions am: 347843b2 am:...

[automerger skipped] Rewrite how we abandon sessions am: 347843b2 am: da979c04 -s ours am: 663824f5 -s ours

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

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

Change-Id: Ic914ba7e6fcf2b01e6b988292d9da00785477c26