Merge "Camera: update Intent firstly at api1 capture with device3" am: 792a7e94a5
am: fd99b9f7fc

Change-Id: Ia5c92a287b516750a9513de0284f61374b0abe06