Merge "Camera3Device: Wait for empty in-flight map when waiting for idle" into nyc-mr1-dev
am: d17567dcae

Change-Id: I414ea368400231003ac8cc852000c84d408107d4