[automerger skipped] Merge "Use Launcher smartspace instead of SysUI's for the...

[automerger skipped] Merge "Use Launcher smartspace instead of SysUI's for the shared element transition." into tm-dev am: 7b5e80f2 am: 4c4fac6c -s ours

am skip reason: Merged-In I58fa437eea183691ff29548143664698498c2105 with SHA-1 ddfe8bda is already in history

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



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