am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5

* commit 'ff475c0ea71ffd5f015cce1462daf373129ca896':
  camera2: Fix legacy scaling factor application.