Merge "Camera3Device: Wait for empty in-flight map when waiting for idle" into...
Merge "Camera3Device: Wait for empty in-flight map when waiting for idle" into nyc-mr1-dev am: d17567dc
am: 1d8e0105
Change-Id: I9812af5ff22a488fc8f77c11c605a61026a65797