Revert "Revert "Fix device death tests."" am: 479381ccf2 am: b946fde85b

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

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