Merge "Merge "DO NOT MERGE Revert "CameraITS: check props before applying linear  tonemap"" into lollipop-mr1-cts-dev am: f5f14df6ff  -s ours" into marshmallow-cts-dev
am: 0c2615d75d  -s ours

Change-Id: I961e8525085d8a6e9fbf41774dee955cc30d993b