am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev

* commit '9d2189ffcf1142b2948ce3065c32521ed7d966c4':
  Camera2Client: avoid two consecutive sets of configure_streams calls