Merge "Address issues surrounding freezing by display." into oc-dev

author Bryce Lee <brycelee@google.com>

Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 13 Jun 2017 18:51:04 +0000 (18:51 +0000)
author Bryce Lee <brycelee@google.com>
Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 13 Jun 2017 18:51:04 +0000 (18:51 +0000)
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Bryce Lee <brycelee@google.com>
	Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 13 Jun 2017 18:51:04 +0000 (18:51 +0000)