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

Merge "Collect change before starting transition" into udc-dev am: 793951c7 am: 664ff442 am: fb3cdfcb am: a27478e8

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



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