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

Change-Id: Iefbb0624b59471f16785a2f2e219f4f5afae042c