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: ef16b4f0 am: c81f89fc am: 85506927

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



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