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

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

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

Change-Id: I075d0b1c4fc24adb6a8ec0d171698e5a707cb1a0