Merge "Merge "Camera: fix previewCb come earlier than layout done" into oreo-cts-dev am: 9bb2c4d7" into oreo-mr1-cts-dev