Merge "SurfaceFlinger: frame rate heuristic during config change" into rvc-dev am: 36725c77ca

Change-Id: I899cf48235bb79097b2198401bbe9ab66aa99c0c