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

[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d6 -s ours am: 0f41c5ec -s ours am: 556ec39a -s ours am: 7f41fc04 -s ours

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

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

Change-Id: Idbe79aaef3a6e0a817cd6cf5eb93adbb737ca6c4