Merge "Merge "Populate additional fields for smartspace logging" into...

Merge "Merge "Populate additional fields for smartspace logging" into sc-qpr1-dev am: bff78358 am: 0a87be97" into sc-v2-dev-plus-aosp am: 32d6d9b1

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

Change-Id: I9c940aaada1fcdf0cf7c0414ca48d60b86a39085