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

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



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