camera: bring back more of the preview metadata workaround.

Fixes issues with switching between FFC and back camera on some devices.

Change-Id: Ie2cef65263816b22e45513cfc639c32b48a49bec
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	services/camera/libcameraservice/CameraClient.cpp