Merge "Remove the failed-to-launch activity if attached to a parent" into tm-dev am: 7079a988

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

Change-Id: Ie7731708c1a4dc970837a286a7376779460e8c44