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

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



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