[automerger skipped] Rewrite how we abandon sessions am: 347843b298 -s ours am: 9843e01c19 -s ours

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

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

Change-Id: Iecfa43adb1d7dbac8caa98c2b6134a8d91d39db0