[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 skip reason: subject contains skip directive

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

Change-Id: Id877c9754651921f40523e5f31d32ecd961e5a5e