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

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

Change-Id: I6b01ae7db5586e7a0fe6b1ec8acab8883083c3a6