am 3c0ca7d5: am 6c075acf: am fb2d29b0: am c26b490d: Merge "DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices" into lmp-mr1-dev

* commit '3c0ca7d55cfefc346a22ad892fd19ac38ed69f5b':
  DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices