Merge "system server watchdog caused by deadlock" into rvc-qpr-dev am: e48401c147

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

Change-Id: I9a412a97425008e1aeba0110e8f5c0b69e4a8150