Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8

am: f0d3971021

Change-Id: I5ee14c0887eaeac267c815851ae6f9e8ee47d80f

diff --cc core/java/android/view/ThreadedRenderer.java
Simple merge

diff --cc core/jni/android_view_ThreadedRenderer.cpp
Simple merge

diff --cc libs/hwui/renderthread/EglManager.cpp
Simple merge

diff --cc libs/hwui/renderthread/RenderProxy.cpp
Simple merge

diff --cc libs/hwui/renderthread/RenderProxy.h
Simple merge