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

Change-Id: Ifbb9728c2879e1ab3581f0cb22ee14243085cd4f