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 am: 091d281c

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



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