Merge "Camera: Fix incorrect hardware level comparisions in CTS" into pie-cts-dev