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

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



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