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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11813840

Change-Id: I17fd34a038c61142e1e8f864fd65ab3518bee365