Merge "SurfaceFlinger: getRefreshRateForContentV2 always returns valid config" into rvc-dev am: 2a95359e37

Change-Id: I40f7b8ce899be377b892b6a21e8b61f913583a6a