Merge "clearLockTask for root tasks as well at removal" into sc-dev am: ec801cc398

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

Change-Id: If97ed114fbf831099b37f1206e04f2539aa38966