Merge "Removed unnecessary check. Replaced EXPECT_TRUE with EXPECT_NE." am: 1b78a3abfb am: 97b7de9f42 am: 99054e8a92 am: eab74d9c8d am: 04bdaf1d1c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2085744

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