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

Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a