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

Change-Id: I3a05fbe6d3a19040d282ab2eb900a232849f33c7