[automerger skipped] Camera: add proper HwLevel check am: cd02298b46 am: 616f595527
am: 8235ceff90  -s ours

Change-Id: I4ead2f00e9e6341e42e5682b0aecc339434cfae9