[automerger skipped] Merge "[DO NOT MERGE] Smartspace - Don't connect until setup" into sc-qpr1-dev am: 7b682e29dc am: c3a0ac5201 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748618 Change-Id: I0f500ba569a8223aa5cfd824f12b4d9333de2d13
This commit is contained in: