Merge "Return early in removeTask if there is no task token" into udc-dev am: 0ea18527

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



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