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: c76ee3c6

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



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