Merge "Merge "Camera: fix emulator deadlock" into oc-dr1-dev am: 84201fee0b am: 78611d7da9" into oc-mr1-dev-plus-aosp
am: 96fca845de

Change-Id: I9eef223932f6993e9fc90e6e61695a05d6c7f45d