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

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

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