[automerger skipped] Merge "Removing tile reveal animation in functional...

[automerger skipped] Merge "Removing tile reveal animation in functional tests" into udc-qpr-dev am: 5f5a3f57 am: acf2e768 -s ours

am skip reason: Merged-In I98ef228376d944680f681ca5a5ed60be2b183788 with SHA-1 f6c21275 is already in history

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



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