Merge "Collect changes for transition right before updating config" into...

Merge "Collect changes for transition right before updating config" into tm-qpr-dev am: 7ae652e5 am: 4654cfc8

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



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