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