Merge "SurfaceFlinger: fix infrequent frames logic" into rvc-dev am: 7e221c91cd am: 17f2daedab am: 854bac8a27

Change-Id: I4976228e8f7e6b4ee27dedc9fdefdae89e111d3f