Merge "Camera: fix deadlock with flush" into oc-dr1-dev
am: 679b6f6eaa

Change-Id: I9fa7a09448ff4b61584e91d04ba974c48e2f4854