Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4c3 am: 2b2066096b

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

Change-Id: I6cc7d4aac462af6bff8703300fc035a161a7c7ba