Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev

author Winson Chung <winsonc@google.com>

Thu, 13 Apr 2017 16:01:48 +0000 (16:01 +0000)

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

Thu, 13 Apr 2017 16:01:51 +0000 (16:01 +0000)
author Winson Chung <winsonc@google.com>
Thu, 13 Apr 2017 16:01:48 +0000 (16:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 13 Apr 2017 16:01:51 +0000 (16:01 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 13 Apr 2017 16:01:48 +0000 (16:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 13 Apr 2017 16:01:51 +0000 (16:01 +0000)