[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: be265ff8c6 -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
This commit is contained in: