Merge "Fix a regression from miss detect cross-task target." into udc-dev am: 09e278cb

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



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