Merge "Camera: Fix preCorrectionActiveArraySize check" into stage-aosp-pi-cts-dev
am: 4c2dbcbed3

Change-Id: I8b78b44a35465370dc645306f4bc175a6564cfc8