[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d60f am: 09acdc8edf -s ours am: e08231618d -s ours

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

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

Change-Id: I91f442ee435ccc69a6f56a93c29ec30c0da9a591