Merge "CHECK -> CHECK_EQ copy pasta" am: a8138bfbf6 am: dd39b5c9d0

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

Change-Id: I245a8813187363f7b7fb2d227c82e9b1b3aa48da