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

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

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