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

[automerger skipped] Merge "Don't abandon child sessions (1/n)" into sc-dev am: 67f179f6 -s ours am: b0168eaa -s ours

am skip reason: Merged-In Ib0ba9f3786dda2d3174f3ea8c65d1061a3fcb586 with SHA-1 93248438 is already in history

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

Change-Id: If3b7b67f8bd5b9a07a69c84eeb09ce83f585bcfe