Merge changes Ia9df12fa,Ib114e8cb into pi-dev am: d8bfc71c6c

author Rob Carr <racarr@google.com>

Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)

committer android-build-merger <android-build-merger@google.com>

Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)
author Rob Carr <racarr@google.com>
Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)
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
author	Rob Carr <racarr@google.com>
	Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)
		1	2
services/core/java/com/android/server/policy/PhoneWindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowState.java	patch \|	diff1 \|	diff2 \|	blob \| history