Merge "Move display id into MotionEvent"

diff --cc config/hiddenapi-light-greylist.txt
Simple merge

diff --cc core/java/android/hardware/input/InputManagerInternal.java
Simple merge

diff --cc core/java/android/service/wallpaper/WallpaperService.java
Simple merge

diff --cc core/java/android/view/ViewRootImpl.java
Simple merge

diff --cc core/java/android/view/WindowManagerPolicyConstants.java
Simple merge

diff --cc services/core/java/com/android/server/input/InputManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge

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