Merge "Do not resolve activity creation if it is in unknown TaskFragment" into...

Merge "Do not resolve activity creation if it is in unknown TaskFragment" into tm-dev am: 327887fa am: ef17f29b am: f50591c0 am: 11001b0a

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



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