[automerger skipped] Merge "[DO NOT MERGE] Smartspace - Don't connect until setup" into sc-v2-dev am: abd63e93 am: ab50320d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icd41127f949ce2169786e1b956fae188da8e6b31