Merge "Remove uses of deprecated GTest macro." am: 3eed07ead0 am: c74317cabf

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469729

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