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

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

Change-Id: I75c0e810eaa0e5cc61a66a18b4b560ce8d1608f5