[automerger skipped] Merge "Rewrite how we abandon sessions" am: f9e818047f am: 7fdd370876 am: 208826a508 -s ours am: 0827cf25d2 -s ours

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

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

Change-Id: Ia95852e749ed376f5adff2bc2608bc07701ca559