Merge "Attempt to fix WrongTypeOfReturnValue flaky exception"

    @Before

    public void setUp() throws Exception {

        synchronized (mWm.mGlobalLock) {

            // Hold the lock to protect the stubbing from being accessed by other threads.

            spyOn(mWm.mRoot);

            doNothing().when(mWm.mRoot).performSurfacePlacement(anyBoolean());

        }

        mDc = mWm.getDefaultDisplayContentLocked();

    }