Merge "Update test for smartspace disconnect" into sc-v2-dev am: 0c70126626 am: 4aec9df38f

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

Change-Id: I183d840ffe48f5e9db88578deea9518b504c9767