Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE

- Requests were missing control type (capture vs reprocess)
- Not waiting for streams to be drained before disconnecting (sporadic fails)

Change-Id: Icaf88287344e98138b22afcd14b9f1878cdffa47
1 file changed