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

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



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