Merge changes from topic "am-3a9d5997f614463fb6dc24c10a8abc63" into sc-v2-dev-plus-aosp
* changes: [automerger skipped] Merge "[DO NOT MERGE] Smartspace - Don't connect until setup" into sc-qpr1-dev am:7b682e29dcam:c3a0ac5201-s ours [automerger skipped] [DO NOT MERGE] Smartspace - Don't connect until setup am:bb0f290077am:c69d67b39e-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
b4b8238b34