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

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



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