Merge "Check is leaf task before remove its child containers" into tm-qpr-dev...

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

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



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