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

Change-Id: I337356d8b434ff72a432d02c73c5b4fa286c1a73