Merge changes from topic "mpietal_smartspace" into tm-qpr-dev am: e81f65a6

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



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