am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev

* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
  camera2: Increase preview frame timeout