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

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

Change-Id: I1aa4ab5a04c970fa61cef1d52df4736a959f1943