Merge "Don't abandon child sessions (1/n)" into sc-dev am: 67f179f636

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

Change-Id: I88141e3cde062d190c1b8e96de7112be84f62f6b