Merge changes Iaad31c0d,I76b824f2

* changes:
  SurfaceFlinger: add Transaction test for setAllowedDisplayConfigs
  SurfaceFlinger: add a unit test for DispSyncSource