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

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

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



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