Merge "Smartspace - Allow clicks to avoid intent launch" into sc-v2-dev am: 4d7afd976a am: f20d18728e

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

Change-Id: I1e1a31d946648cd346ae9ccbd4f33f77c625ef27