[automerger skipped] Merge "Add a 5 second timeout to launch animation touch...

[automerger skipped] Merge "Add a 5 second timeout to launch animation touch blocking" into udc-d1-dev am: 9aba81b3 -s ours am: 14f58c48 -s ours

am skip reason: Merged-In I5c240a9ee852bf57e8ec251b733708086e825b45 with SHA-1 a8bd8a8b is already in history

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



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