Merge "Find activity in task with same user" into tm-qpr-dev am: fc9ccbb8 am: a3e9c750

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



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