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