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

am skip reason: skipped by user wangchun

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

Change-Id: Ib8aa39c8fe9dff5ef43f4e8054111cf62594601b