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

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

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