Merge "Fix CameraHidlTest" am: eb86f93f53 am: efba724466 am: 22557982dd

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

Change-Id: Id8c00dc793dd531b5ccfddc76684af39d2e2229b