Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481

am: 7def2eea97

Change-Id: I538777a295628827fc3052c58641cbb659afad20

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

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

diff --cc services/core/java/com/android/server/vr/VrManagerService.java
Simple merge

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

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