Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38 am: ed6abddaf8

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

Change-Id: I884143be08a9ac914836d896597ba6db63fdf8d9