[automerger skipped] Merge "[flexiglass] Fix multiple smartspace view issue."...

[automerger skipped] Merge "[flexiglass] Fix multiple smartspace view issue." into udc-qpr-dev am: ef9a816c am: 29d74c19 -s ours

am skip reason: Merged-In I94f16972f3be402cf1a581d6fd2d355bbea5c85e with SHA-1 28baed28 is already in history

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



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