Merge "Increase test coverage" am: eecfd6e507 am: 49c79e3698 am: 4c2effc89f am: 64a5061758

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

Change-Id: I73b9cca3aeadd6b35a718a5ff7855a9bd7be34d0