Merge "[flexiglass] Fix multiple smartspace view issue." into udc-qpr-dev am: ef9a816c

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



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