Merge "Add property to disable camera service proxy." into cw-f-dev
am: fa10c2869b

Change-Id: Ie489e5d7b27087a8284319997404c7c8cc8fa98f