Merge "Fix some incompatibilities of 3p launcher and recentstransition" into...

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

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



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