Merge changes from topic "smartspace-on-dream-overlay" into tm-qpr-dev am:...

Merge changes from topic "smartspace-on-dream-overlay" into tm-qpr-dev am: 460cffff am: 4c5c8265

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



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