Merge "[Stability][Bugfix] Catch DeadObjectException in TCMS." am: 8c93a72063 am: 4259e1cf46

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

Change-Id: Ic0ac838f21394dec34ad73d859a016fb4a1c35a6