Merge "Camera: Try adding a passthrough legacy service" into oc-dr1-dev
am: efe973102a

Change-Id: Id9e41637c8afcf6d4a06fede7e023d41ee9126aa