Merge "Put transition collect in scope of defer layout" into tm-qpr-dev am: fb3ae63290

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

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