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

[automerger skipped] Merge "Don't abandon child sessions (1/n)" into sc-v2-dev am: 24589d96 am: 99cbd2cb -s ours

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

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

Change-Id: I915c8a313870f39960358114e2f2e2dea33dc86d