[automerger skipped] [DO NOT MERGE] Smartspace - Don't connect until setup am: bb0f2900 am: c69d67b3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5e8b37662cf647b32ad991cd19871c435f14eb11