Merge "Fix some incompatibilities of 3p launcher and recentstransition" into udc-dev am: 4edd2444 am: df862028

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



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