[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 -s ours am: 2190ea88 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1ed4de2295af49a53b2b97fbc26ab79fddb46bad