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: b37fc7a6

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



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