Merge "Allow stacks in split screen to show on lock screen."

author Chavi Weingarten <chaviw@google.com>

Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)

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

Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)
author Chavi Weingarten <chaviw@google.com>
Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Chavi Weingarten <chaviw@google.com>
	Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)