Merge "SurfaceFlinger: tune infrequent detection logic more" into rvc-dev am: 507056a4 am: 690e3716

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

Change-Id: I1387a361828015e7885a9db75f19c2dd725d8788