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

Change-Id: I36ae187d98ccd0bff76d40cbaea9af6266e5a140