[automerger skipped] Merge "[DO NOT MERGE] Support multiple smartspace views" into sc-v2-dev am: 5088c490 am: 3f2853f9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I668591e33e47ba961f154e11d792c68bed5625f5