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