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

Change-Id: I8ba90b9882ee28bf450dfcc6a881b1586f4f604f