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 am: f774bedc

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



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