[automerger skipped] Merge "[DO NOT MERGE] Make sure smartspace connects when...

[automerger skipped] Merge "[DO NOT MERGE] Make sure smartspace connects when added" into sc-v2-dev am: c4c480ab am: 4ea7195a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6870301a3dc51adef6083e2db3d0586b13fbaadc