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

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

Change-Id: I1c27615308364a0c41cd0cae7e5c4c826a995c91