Merge changes I1348da2c,I103d2a56,I4ed64966

* changes:
  SurfaceFlinger: set change phase offsets for 90Hz
  SurfaceFlinger: get expectedPresentTime from Scheduler
  SF: set active config state machine