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

Change-Id: Ie9772c3fd656fca07a177b53fe41c8234add8fed