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