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

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



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