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: 1ee19b55 am: 0e9adf38

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



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