Merge "Increase test coverage" am: eecfd6e507

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

Change-Id: I10acd21ffc8fa24ea7da4c0753061d4e9d846370