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

[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-qpr-dev am: 8b21c156 -s ours

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

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

Change-Id: I70ffb2b67bd7c0ceb3f6caa4182f5e3f4d3a76b1