[automerger skipped] [DO NOT MERGE] Support multiple smartspace views am: b9b97ec9 am: 6f689683 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icc61441726e4d2593955e8c143b966f1cfb44798