Merge changes from topic "scene-transition-layout" into udc-qpr-dev am: 497b75bb am: 1f7cb0ce

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



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