am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

* commit '2ff214b603939af60cae11727e189eb350b34c39':
  Camera2: Add HDR scene mode for backwards compatibility.