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

Change-Id: Ib7a3449dcb223635d1aee0682c69c38ee0d8280d