Merge "Increase test coverage" am: eecfd6e507 am: 49c79e3698

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

Change-Id: I12f278646c4ebf16443733d6c3c1063b56144480