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 am: aaa7267dc5 am: 149a772f05 am: 387010e362 am: c3e4314546  -s ours am: fce52b1763 am: bfa47ac03a am: 3e02824b2c am: 5a715187c5 am: 9f625436b6
am: b3131e765d  -s ours

Change-Id: If50c36d17b6b3fcb07a9e3ff35773ec7deeb0782