Merge "Revert "Force remove DreamActivity from system server""

package com.android.server.dreams;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;

import android.app.ActivityTaskManager;

import android.app.BroadcastOptions;

import android.content.ComponentName;

import android.content.Context;

    private final Context mContext;

    private final Handler mHandler;

    private final Listener mListener;

    private final ActivityTaskManager mActivityTaskManager;

    private final Intent mDreamingStartedIntent = new Intent(Intent.ACTION_DREAMING_STARTED)

            .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

        mContext = context;

        mHandler = handler;

        mListener = listener;

        mActivityTaskManager = mContext.getSystemService(ActivityTaskManager.class);

        mCloseNotificationShadeIntent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        mCloseNotificationShadeIntent.putExtra("reason", "dream");

    }

                    mSentStartBroadcast = false;

                }

                mActivityTaskManager.removeRootTasksWithActivityTypes(

                        new int[] {ACTIVITY_TYPE_DREAM});

                mListener.onDreamStopped(dream.mToken);

            }

        } finally {