[automerger skipped] Merge "Don't abandon child sessions (1/n)" into qt-dev...

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

am skip reason: skipped by user schfan

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

Change-Id: I715b2fed3e9005989f93e95a211a020eb919ee2e