camera2: (legacy) Fixes for CaptureRequestTest#testAeModeAndLock

Change-Id: I5c1008cf34a9d98f67c36966e7cbf1c312979f97
3 files changed