Merge changes I14bb4722,I01f139b3 into rvc-dev

* changes:
  SurfaceFlinger: add a backdoor to override DisplayManager policy
  SurfaceFlinger: always consider layers with setFrameRate