Merge "Merge "Use fenceTime from drawingState instead of bufferInfo" into rvc-dev am: 6c457787c9 am: 85368a410f" into rvc-d1-dev-plus-aosp