Merge "Disable failing app launch assertion on shell transitions" into tm-dev...

Merge "Disable failing app launch assertion on shell transitions" into tm-dev am: 77e8e359 am: bcd25897

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



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