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

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

Change-Id: I2aa2077cffbbee18a0cd25acb46c3a8e0c4b6f14