[conflict] Merge "Use Launcher smartspace instead of SysUI's for the shared...

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

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



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