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

Change-Id: I688acc2229679fab0ae38f4c256619a96c0f291b