Merge "Fix CameraHidlTest" am: eb86f93f53

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

Change-Id: Ie6c744bdd5cd3ffa36647fa1fbe4a985a89916e3