Merge "Populate additional fields for smartspace logging" into sc-qpr1-dev am:...

Merge "Populate additional fields for smartspace logging" into sc-qpr1-dev am: bff78358 am: 519b79b7

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

Change-Id: Icf8a67d9334fb535605255a1194849fda3a79ffe