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

[automerger skipped] Merge "Don't abandon child sessions (1/n)" into sc-qpr1-dev am: a1ecc3eb am: 72795684 -s ours am: a1847dc1 -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/+/16572064

Change-Id: Iee3b72d86280435c354c8850ce456b23176356cc