am 2155e050: am 831c7139: Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev

* commit '2155e050dbf993c894b534a5e9387ebe47b41657':
  Camera: Add HDR scene mode constants.