Merge "Only provide the resolved activity info to the global intercept window" into sc-dev am: b827a8ac am: 6e004f8b am: 9c90d2ac

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

Change-Id: I07fcb20a9a00dcc8d1849e496f118898ec3ad32f