[automerger skipped] Merge "Don't abandon child sessions (1/n)" into qt-dev am: 5bf4a3f2 -s ours

am skip reason: skipped by user schfan

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

Change-Id: Ie9547a891f73ff858f29c144d4c4c55ddd7e4292