Merge remote-tracking branch 'aosp/pie-gsi' into HEAD

* aosp/pie-gsi:
  Camera: consider all cameras in flash light control
  Camera3: Handle stream format override for shared output stream
  audio policy: fix getOutputFromId and getInputFromId
  Camera: extend getBuffer wait timeout

Change-Id: I39384e55edb3f353209f90fbb141cda81e2ff4c0