Merge ""Merge" activity-only transitions into ongoing recents" into udc-dev am: 6a7dca36 am: 1e2a7743

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



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