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

Change-Id: Iccfb2cd5181f79549b9b268c01168fcebaa9976b