Merge "Avoid collecting transient activity in next transition" into udc-dev...

Merge "Avoid collecting transient activity in next transition" into udc-dev am: fb257a4c am: 1678646f

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



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