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

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

Change-Id: Idc9872f8016f2559bf840f686c1ad5b6e88e6402