[automerger skipped] Merge "Don't abandon child sessions (1/n)" into qt-dev am: 5bf4a3f29e -s ours am: a0961661bb -s ours am: 793e127159 -s ours am: b3f20c921b -s ours am: c860c407d5 -s ours am: c1f4e6df00 -s ours

am skip reason: skipped by user schfan

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

Change-Id: If11bec896f9a0a868ba5a997603b4b02cc0948aa