Merge changes from topic "display_policy"

* changes:
  SurfaceFlinger: add DISPLAY_EVENT_CONFIG_CHANGED
  SurfaceFlinger: add setAllowedDisplayConfigs

diff --cc libs/gui/ISurfaceComposer.cpp
Simple merge

diff --cc libs/gui/SurfaceComposerClient.cpp
Simple merge

diff --cc libs/gui/include/gui/ISurfaceComposer.h
Simple merge

diff --cc libs/gui/include/gui/SurfaceComposerClient.h
Simple merge

diff --cc libs/gui/tests/Surface_test.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge