Merge changes from topic "Smartspace Subcard Logging" into sc-v2-dev-plus-aosp am: 3fa3b309 am: 7c2595f5

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



Change-Id: I4649208f8976127051b9749357ad5c901511752c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>