Merge "SurfaceFlinger: use queueTime as well when calculating refresh rate" into rvc-dev am: 16596ab1 am: fb5f7c37

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

Change-Id: Ib60cce7dea664cca716690f998a64bc0984a1327