Merge "Check is leaf task before remove its child containers" into tm-qpr-dev am: 3f5ba376

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



Change-Id: I1feedef310d934378a25e98b4bdafba1e33bb0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>