Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev

author Winson Chung <winsonc@google.com>

Thu, 18 May 2017 23:15:27 +0000 (23:15 +0000)

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

Thu, 18 May 2017 23:15:35 +0000 (23:15 +0000)
author Winson Chung <winsonc@google.com>
Thu, 18 May 2017 23:15:27 +0000 (23:15 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 18 May 2017 23:15:35 +0000 (23:15 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 18 May 2017 23:15:27 +0000 (23:15 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 18 May 2017 23:15:35 +0000 (23:15 +0000)