Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" am: 3d04184bd2 am: 2c09b198fe am: 03e9895b00

Change-Id: I03d2f91a590d0212d6e78d0761dcd4374560f1d1