[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: bebd3ff299 -s ours am: c8a55e538b -s ours

am skip reason: skipped by user schfan

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

Change-Id: I57c4724f2320853dcfbd9d313a59175061eba321