Merge "Fix intent in HotspotTile" into sc-qpr1-dev am: 1b4cc5d7a0 am: c482b8d89e

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

Change-Id: I5404508dc731e5f4b801d19c8ab101b5ccde02c0