[automerger skipped] Merge "Don't abandon child sessions (1/n)" into qt-dev am: 5bf4a3f29e -s ours am: a0961661bb -s ours
am skip reason: skipped by user schfan Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16572163 Change-Id: I4c52b159f68e5086d84edeb22080323ac205c96e
This commit is contained in: