Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am: 0cfad57566
am: df7d855072

Change-Id: I945d6ef3bad30a96c1ff1457b793bf5270e6950e