[automerger skipped] Make NSWVC throw on userdebug builds when launch animation times out am: 6585b8a8b2 am: bb443d39ba -s ours

am skip reason: Merged-In I91799c3cb04a2c6539853ae7b14e6bfeba19f9ea with SHA-1 df2a635443 is already in history

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

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