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

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

Change-Id: I5cda3ea4016f748dfa72f577fe76cb55b71ac010