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

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



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