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

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



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