Merge "Disable smartspace transition on tablet." into tm-dev am: c648c3a7 am: 413ad84f

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



Change-Id: I342857b57e4d445a12fa97bf9c955d31f6931341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>