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

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



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