Merge "Merge "Always show CHANGE containers in transition setup" into udc-dev...

Merge "Merge "Always show CHANGE containers in transition setup" into udc-dev am: 3376f686 am: 664195f9 am: d5c4827e" into udc-qpr-dev-plus-aosp am: b6a5c022

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



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