Merge "Fix SmartspaceService callback comparison." into tm-qpr-dev am: 7f47d9d4 am: 595d584b

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



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