[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: b3f20c92 -s ours am: c860c407 -s ours am: c1f4e6df -s ours am: 91c63185 -s ours am: 6bdcd436 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I02d6378e88e5a45ea3d6d5827911ef933f8c9e8e