Merge "Fix CameraHidlTest" am: eb86f93f53 am: efba724466

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

Change-Id: Iba379b60a2b3304f36dfb5086bc9e66a8804eee0