Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4 am:...

Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4 am: 2b206609 am: 6c1e2dd1

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

Change-Id: I5d09633b61cacee180882f13219c5cbf9e8f470c