Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d60f

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

Change-Id: Ib2ff57114ea9cd6b368000ca16897fa9d6528e05