Revert "Revert "Revert "Fix device death tests.""" am: 42795cf170 am: 276e32ec33

Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2475384

Change-Id: I93c1bd0538c18e2abd5b279ac59e48a6105abe64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>