Merge changes from topic "wp-page-transitions-flag" into udc-qpr-dev am: 63870eaf am: c4b67799

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



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