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

Change-Id: I5200f775bbb09e2911b0ee39f2b1b9ad42857cf9