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

* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.