Merge "Add a 5 second timeout to launch animation touch blocking" into...

Merge "Add a 5 second timeout to launch animation touch blocking" into udc-qpr-dev am: 2d505f32 am: 3c97d5ca

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



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