Merge "Collect change before starting transition" into udc-dev am: 793951c7...

Merge "Collect change before starting transition" into udc-dev am: 793951c7 am: b76d938e am: 5ab94ba7

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



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