[automerger skipped] Merge "[DO NOT MERGE] Smartspace - Don't connect until...

[automerger skipped] Merge "[DO NOT MERGE] Smartspace - Don't connect until setup" into sc-qpr1-dev am: 7b682e29 am: c3a0ac52 -s ours am: d84ae7e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaa46413221d3ffb4f0da4c411d39031470a8f716