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

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



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