Merge changes Ie6bebede,I21ebbfb0

* changes:
  Fixed Dimmer test
  Each dimmer can only have one dim layer at a time.

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge