Merge "Add AutoCancelTest back to framework tests"

import android.os.Handler;

import android.test.ActivityInstrumentationTestCase2;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.Suppress;

import java.util.HashMap;

import java.util.concurrent.TimeUnit;

@Suppress  // Failing

public class AutoCancelTest extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> {

    boolean mAnimX1Canceled = false;