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

Change-Id: I9e0a7fa54b16872e17137904c9607752b358b54d