[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 am: 09acdc8e -s ours am: e0823161 -s ours am: 3c951a87 -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/+/16572034

Change-Id: I25f6fbd625273fff4ee0366455131ad37122da8e