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