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

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



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