Merge "Fix cutout with temp inset bounds" into pi-dev am: db704ca8bf

author Jorim Jaggi <jjaggi@google.com>

Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)

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

Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)
author Jorim Jaggi <jjaggi@google.com>
Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)
diff --cc services/core/java/com/android/server/wm/WindowState.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 20 Apr 2018 11:26:21 +0000 (04:26 -0700)