Merge "system server watchdog caused by deadlock" into rvc-qpr-dev am: e48401c1 am: 70c52930

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

Change-Id: I48f64530e2f56d1816ecb06a1270e9c68603edbd