Merge "Adapt transition merge during recents into onTaskAppeared." into sc-dev am: aadebf0a am: 772bb525

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

Change-Id: I95e6e24dfd9eea1d6d8cc88478c717aab3b8ffa4