Merge "[automerger skipped] Merge "Camera: Consider exposure time when waiting for frames" into oreo-mr1-cts-dev am: 81bb854e20  -s ours" into pie-cts-dev
am: 222b6d1c1c  -s ours

Change-Id: I8ea0a49fd9f47efda613bd00b2bd7faecb1d4b28