Merge "Legacy smartspace alignment fixes" into sc-v2-dev am: 65d19ed0 am: 05305a93

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

Change-Id: I3b1a7321666275964b6042043bfe92a7a293f3e3