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

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

Change-Id: I299259448958bf26f2522dceac3fddb71dbf9c67