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

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

Change-Id: Ia7946f8ecfee3597121a237a884c8cac79e0d01b