Merge "Merge "Return early in removeTask if there is no task token" into udc-dev am: 0ea18527" into udc-dev-plus-aosp am: 97b2efcc am: a53e361b am: 670b8e9f

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



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