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

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

Change-Id: I0e7c95d89cde77f340c2bbc063b5cd52ce78f01c