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

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



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