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

Change-Id: Iacbd97b603ab51fa82d60180b093a2162b5363ed