Merge "Fix Smartspace media logging bugs" into sc-v2-dev am: 60b5873b am: 3e76eb37

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

Change-Id: Icbcec41f16a8f0c170d69954d509a594d766e971