[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 am: 710414e0 -s ours

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

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

Change-Id: I4523b682ae8fa4451ee699a3fd0c955ded08b36b