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

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

Change-Id: Ifce4cfe3e22ecd3b37f77a0d940bed0b340804fa